Re: 'svn merge -rX' UI annoyance.

On 2005-08-04 18:07:49 Marc Haisenko wrote:
> Interesting... but would you rather do the merges one after another or
> all at once ? And if one merge produces a conflict, would you like all
> others to be reverted, or left in places ? What about the merges after
> the one that conflicted ? What to do if two merges contradict each
> other ?

One straightforward way to look at this, is as a serial line of patches,
so if the first merge doesn’t succeed, the file stays in conflict and
the other merges goes into those conflicted files, just as it would’ve
been on the commandline when merging several times.

> I don't like to say this is a bad feature, it's certainly useful, but
> I think this feature would be quite hard to design correctly and my
> impression is that only few people would gain from it...

But when you really need it, it’s a powerful feature usable for a range
of things.

Cheers,
sunny256

--
#!/bin/bash
for f in 1 2 3; do
  PREF=http://musthave.sunbase.org/Stallman/stallman${f}c
  wget $PREF.sub ; mplayer -cache 8192 -sub stallman${f}c.sub $PREF.mpeg
done
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org