[Svnmerge] Merge, revert, merge may not commit added files

Raman Gupta rocketraman at fastmail.fm
Thu Jun 8 19:57:20 PDT 2006


Blair Zajac wrote:
> On large merges, you could easily miss this line if you're not paying
> attention.  So I would like to see svnmerge.py handle this case, either
> by checking for stray files in the working copy or parsing the 'svn
> merge' output.
> 
> Comments on either approach?

I've often thought a summary of the merge would be nice. Something like:

10 files added
15 files updated
4 files deleted
1 file with conflicts
2 files skipped

This would probably best be done by parsing the output of the merge.

Cheers,
Raman



More information about the Svnmerge mailing list