Even more merge thoughts...
From: Hans-Emil Skogh <Hans-Emil.Skogh_at_tritech.se>
Date: Tue, 29 Nov 2011 11:31:14 +0000
Now with svn 1.7.2 coming up this might not be the best timing to come dragging with some more merge thoughts. But hey, is there ever a good time? :-)
Here are a few points that have come up during this round of merges:
- The Merge dialog contains the helpful hint "To merge all revisions, leave the box empty.". I have to keep remind people that this is indeed the case, and there's no need to enter any revision numbers if it's not cherry picking that we are after.
- In the Merge dialog when the "Show log" button is clicked, the Log dialog that opens will list revisions as far back as it can. This is mostly not what you want. I would say that the usual case would be to show revisions that are younger than the branch. Doing this would prevent the additional clutter of showing lots of revisions that are already, implicitly, part of the branch.
Then there's the topic of "Test merge". I have more or less stopped using it since it does not really provide any time benefit, and the predicted conflicts are mostly greatly exaggerated. Is there really no way to make the test merge more accurate when it comes to predicting conflicts?
- When a Test merge is performed, I would suggest changing from the red "conflicted" to an orange "potential conflict", to highlight that this is only an assumed conflict. The manual clearly states this, but not everyone reads the manual...
I think that was all for now. :-)
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
This is an archived mail posted to the TortoiseSVN Dev mailing list.