[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Help needed in running svnmerge.py

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-06-19 17:17:49 CEST

Hi All,
I tried to merge recent trunk changes to revprop-sqlite branch.
I never used svnmerge.py in the past.

In the revprop-sqlite branch I could see 'svnmerge-integrated :
/trunk:1-24022'(This comes from trunk(from erstwhile merge-tracking

I think this causes my 'svnmerge.py init' to fail.

[kamesh@kamesh revprop-sqlite]$
./contrib/client-side/svnmerge/svnmerge.py init
svnmerge: /trunk has already been initialized at .
Use --force to re-initialize

When I tried to run with '--force', I could this value changed to '
/trunk:1-25347'. But I could not do 'svnmerge.py merge' because of local

Should I commit 'svnmerge.py init' first and run 'svnmerge.py merge'?

P.S Shall we remove svn:integerated property on /trunk?

With regards
Kamesh Jayachandran

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jun 19 17:17:10 2007

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.