Feb. 28, 2009
11:22 p.m.
Antoine Pitrou wrote:
Le dimanche 01 mars 2009 à 00:11 +0100, "Martin v. Löwis" a écrit :
That's why I keep arguing that the committers making the original commits should also merge their changes, individually, into the respective branches. That way
- commits become separate, and reverting them becomes possible
- the load is shared across all committers
It doesn't really make svnmerge less annoying, though.
Depends on what you are annoyed by. If it is that you get tons of conflicts when you run it, and that it takes forever, and that it combines many small changes into a single one - those will be gone with that change in policy.
Regards, Martin