> > -----Original Message----- > > > 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? > 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?
Ok, I'm gonna go out here on a limb (get it tree conflict, limb, anyway) and say that auto conflict resolution doesn't apply to a tree conflict. I think to resolve a tree conflict you have to manually make the tree in the merge target match the merge source. I don't think svn can or will do that for you automatically. BOb
