Wrong merge from en to pt_BR

Célio Cidral Junior ccidral.newsbox at gmail.com
Wed Jul 5 13:29:49 CDT 2006

2006/7/5, C. Michael Pilato <cmpilato at red-bean.com>:
> ASIDE:  A little piece of Subversion best practice advice -- when committing
> a merge, specify in your log message the whole revision range and path(s)
> used to perform the merge.

Thanks. I changed all the log messages of merges I have commited
before, to include the full paths and whole revision ranges.

> I guess that will work, but I think you can do what you want to do in a
> single step.  Your translation directory currently contains all the en
> changes from the beginning of time until r2206, right?  You need to remove
> the changes between r2140 and r2206, then, yes?  So:
>    svn merge http://svn.red-bean.com/svnbook/trunk/src/en/ -r 2206:2140 .

Wow! How simple (and logical)! Why didn't I try that before?  :-)  It
seems I like to complicate things.



More information about the svnbook-dev mailing list