On Tue, Mar 10, 2009 at 16:13, "Martin v. Löwis" wrote:
> >svnmerge.py -r
> >svn revert .
> >svn commit -F svnmerge-commit-something-press-tab
> >
> > 8<
> >
> > I think it was later corrected that the "svn revert" should be "svn
> > resolved", if it's needed a
>svnmerge.py -r
>svn revert .
>svn commit -F svnmerge-commit-something-press-tab
>
> 8<
>
> I think it was later corrected that the "svn revert" should be "svn
> resolved", if it's needed at all. But I'm not sure about that. As I
> recall, I've never needed tha
Gregory P. Smith wrote:
What I've used when I'm merging a single revision is this:
I think the more pressing question that needs documenting is: "Given
that there are 4 active branches, in which order do I check things in
and merge them?"
Martin gave an answer to this on December 22, and
Gregory P. Smith wrote:
> I think those instructions are for merging lots of things at once.
That FAQ question is actually 3 questions in one:
1. How do I set up merge tracking for a new branch? (A: Use "svnmerge
init") Since this has already been done for the maintenance branches, no
need for an
I think those instructions are for merging lots of things at once.
What I've used when I'm merging a single revision is this:
g...@pts/6.dealer/9:46AM% svn up
~/sandbox/python/release26-maint
At revision 70301.
g...@pts/6.dealer/9:47AM% python ../svnmerge.py merge -r70197
property 'svnmerge-integ
