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

Re: SVN suggestion: addition of a manual merge operation

From: John Dubery <j-d_at_ukonline.co.uk>
Date: 2005-01-29 13:20:14 CET

* thanks for the reply

* the suggestion is unix/linux specific; I'm on windows (where I'm not aware
of an equivalent command to /bin/false); I haven't been able to get
something like that to work on a quick try

* I think it would be useful to provide a command line switch to do a manual
merge (perhaps "--manual" as an alternative to "--diff3-cmd ...") for 2
reasons
  - it would make the functionality accessible to folks who don't want to
get into complicated-sounding (and potentially dangerous) options
  - it would be more efficient if SVN knew not to bother to call an external
merge function

* otherwise, I would suggest including comments on how to do that (for the
main OSs at least) in the SVN book.

cheers

John Dubery

......

> > In addition to this, I'd appreciate a "manual merge" that ...
> > * for files with no differences: leave unchanged as now
> > * for files with differences (even if trivial): behave as for
"conflicted"
> > files in the present merge operation

......

> Try
>
> "svn merge --diff3-cmd /bin/false"

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 31 06:39:16 2005

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