Comment 7 for bug 956268
Revision history for this message
| Alex Lewis (alexlewis-deactivatedaccount) wrote | #7 |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
73416ba
(Get the code!)
Ah now I get it!!... (I think)
Ok so...
parent = trunk
branch = feature-x
If a file has been added to trunk after feature-x was created the bottom panel (whilst viewing feature-x) shows that as a file deleted, because feature-x does not have that file. Once trunk is merged into feature-x to "synchronise" them feature-x shows only the changes actually made on the feature-x branch.
Is that right?
If my understanding is now correct that IMO is a little confusing but that could be just be my lack of experience and one of the complexities of DVCS. If there was a way to display changes you actually made on a branch compared to implied changes because of the divergence from the parent then that might help avoid the confusion.