Bugzilla – Full Text Bug Listing
| Summary: | [sync] Outgoing changes not shown with workspace model | ||||||
|---|---|---|---|---|---|---|---|
| Product: | [Technology] EGit | Reporter: | Benjamin Muskalla <b.muskalla> | ||||
| Component: | Core | Assignee: | Project Inbox <egit.core-inbox> | ||||
| Status: | RESOLVED FIXED | QA Contact: | |||||
| Severity: | normal | ||||||
| Priority: | P3 | CC: | bernd.schatz, caniszczyk, dariusz.luksza | ||||
| Version: | 0.9.0 | ||||||
| Target Milestone: | --- | ||||||
| Hardware: | PC | ||||||
| OS: | Linux | ||||||
| Whiteboard: | |||||||
| Attachments: |
|
||||||
|
Description
Benjamin Muskalla
Created attachment 178285 [details]
screenshot
.
similar problem here.
>> git clone ssh://.....
Cloning into PROJECTNAME...
remote: Counting objects: 10104, done.
remote: Compressing objects: 100% (4135/4135), done.
remote: Total 10104 (delta 4299), reused 10008 (delta 4258)
Receiving objects: 100% (10104/10104), 27.61 MiB | 1.73 MiB/s, done.
Resolving deltas: 100% (4299/4299), done.
2) In eclipse => File => New Java Project => Project name: PROJECTNAME (use default location)
3) team => Share project => git /home/user/git-workspace/PROJECTNAME/.git
4) Create a test file "test.txt"
5) team => Synchronize
Source: <local.git> Ref: HEAD
Destination: <origin> ref: master
==> Synhronizing Git: No changes found. <==
on unix console ==>
# git status
# On branch master
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# test.txt
nothing added to commit but untracked files present (use "git add" to track)
(In reply to comment #2) > 5) team => Synchronize > Source: <local.git> Ref: HEAD > Destination: <origin> ref: master You should also select "Include local uncommited changes in comparison" check box to see locally made changes in workspace model I can't reproduce this issue on 0.10 version, the outgoing changes are always visible whenever it is in outgoing only mode or in outgoing/incoming mode. Benjamin could you please check it on current EGit version. If it issuer doesn't occur we could close this bug. I am still able to reproduce when synchronize between two local branches. The scenario is: - Source branch has outgoing edit (src/Foo.java) - Target branch has incoming add (src/Bar.java) I believe this is due to the fact the folders are marked as incoming and therefore the outgoing changes pane triggers the empty section since the root folder is marked as incoming. One fix I've found is to only return true from GitResourceVariantTreeSubscriber.isSupervised if the resource is a file. Currently folders are marked as supervised which can cause them to display incorrect change direction flags if the folder contains both incoming and outgoing children. Proposed fix pushed to: http://egit.eclipse.org/r/#change,3181 Merged with commit 3fa9329e38292a98178f99b704fa8d59acd8c0ea |