The trunk has:
|
Your shelf has:
|
How may you do a diff of the two so that you may see..
- your changes
- even more of your changes
...?
There is not a way to cross compare two repositories like this. Moreover, since you have been periodically merging commits pushed up to the trunk into your own shelf your history is dirty and there is no easy way to do a diff to see only what you changed before pushing it to the trunk. Grrr. The thing to do to prevent this is to not drag in updates to the trunk to your shelf until you are ready to push your own changes to the trunk. Sure, there is a way to unmerge the "recent coworker changes" changeset, but this is much more painful than just approaching working in Mercurial the right way to begin with.
No comments:
Post a Comment