subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Siefert, David" <dsief...@playboy.com>
Subject RE: merge does not allow --accept argument
Date Fri, 18 Dec 2009 21:01:23 GMT
> -----Original Message-----
> From: Bob Archer [mailto:Bob.Archer@amsi.com]
> Sent: Friday, December 18, 2009 2:53 PM
> To: Siefert, David; users@subversion.apache.org
> Subject: RE: merge does not allow --accept argument
> 
> > I am using Subversion 1.6.5 r38866 on Ubuntu 9.10 (my $SHELL is
> > /bin/bash).  Trying to use merge and have it automatically accept
> > my changes during conflicts by issuing:
> > 	svn merge --accept mine-full -c 12345
> https://repository/branches/blah/blah/blah
> 
> The above looks right.
> 
> > also tried the following variants:
> > 	# based on svn help resolve (uses = in accept argument)
> > 	svn merge --accept=mine-full -c 12345
> > https://repository/branches/blah/blah/blah
> >
> > 	# trying with single quotes as listed in svn help merge
> > 	svn merge --accept='mine-full' -c 12345
> > https://repository/branches/blah/blah/blah
> >
> > 	# trying same as beginning, but with single quotes
> > 	svn merge --accept 'mine-full' -c 12345
> > https://repository/branches/blah/blah/blah
> > with no luck.
> >
> 
> Can you be more specific? What do you mean by "no luck".
> 
> Are you getting an error on your command line. Is it not accepting your
> files on conflicts?
> 
> Bob

Sorry--I meant to add the output from Subversion.  I end up with tree conflicts.  The two
files were added at different times with different contents.  I just want mine to basically
overwrite the others.  Perhaps I need to add some sort of --ignore-ancestry option?

Thanks,
David

Mime
View raw message