You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by John McClement <jo...@yahoo.com.au> on 2004/12/16 05:05:13 UTC
Merging files
I am evaluating subversion and am tring to understand one feature. I
understand that when 2 different users checkout a file and both make
changes, then subversion will merge these by default. I understand that the
changes are committed to the repository, and only flag a conflict if changes
have been made by both users in the same line of the file.
However, in my situation, I would never want merging of files to occur. I
would always want a conflict to be flagged.
Is this possible in Subversion? If so:
1. how do I configure it for this?
2. Can one repository on a server be configured for merging to be on, and
another for it to be off?
Thanks
John
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: auto-props on server side [Re: Merging files]
Posted by Steve Greenland <st...@lsli.com>.
On Thu, Dec 16, 2004 at 01:06:07PM -0800, Chuck Esterbrook wrote:
> On a similar note, telling every developer in a shop to edit their
> config for various auto-props is a mild nuisance. Can these be put on
> the server side? (The docs seemed to imply "no" and the server side
> config file hand no examples so I didn't even try.) If not, perhaps in
> the future?
http://subversion.tigris.org/issues/show_bug.cgi?id=1974
--
"Outlook not so good." That magic 8-ball knows everything! I'll ask
about Exchange Server next.
-- (Stolen from the net)
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merging files
Posted by Tony Overfield <to...@yahoo.com>.
> John McClement wrote:
> I am evaluating subversion and am tring to understand one feature. I
> understand that when 2 different users checkout a file and both make
> changes, then subversion will merge these by default. I understand that the
> changes are committed to the repository, and only flag a conflict if changes
> have been made by both users in the same line of the file.
>
> However, in my situation, I would never want merging of files to occur. I
> would always want a conflict to be flagged.
I once had this (mis)understanding too. The second user's commit does
not cause any kind of a merge, but rather an "out of date" error message.
The second user must merge the repository's changes into his own working
copy by using "update." It is this "update" operation that performs
automatic merging, but it does not change the repository at all.
The second user should then verify that the merge (update) did the right
things to his working copy before he attempts to commit again.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
auto-props on server side [Re: Merging files]
Posted by Chuck Esterbrook <Ch...@yahoo.com>.
On Thu, 16 Dec 2004 07:46:56 -0500, Garrett Rooney wrote:
> You can set this up, but it's client side, not per-repository (yes,
> we agree that it would be nice to be able to configure things on a
> per-repository basis, but right now you can't). Just set the users
> diff3-cmd to something that always fails without doing anything
> (/bin/false comes to mind). This can be either set on the command
> line (the --diff3-cmd option) or in the users ~/.subversion/config
> file (the diff3-cmd in the [helpers] group).
On a similar note, telling every developer in a shop to edit their config for various auto-props is a mild nuisance. Can these be put on the server side? (The docs seemed to imply "no" and the server side config file hand no examples so I didn't even try.) If not, perhaps in the future?
Thanks,
-Chuck
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merging files
Posted by Patrick Smears <pa...@ensoft.co.uk>.
On Thu, 16 Dec 2004, Garrett Rooney wrote:
> John McClement wrote:
> > I am evaluating subversion and am tring to understand one feature. I
> > understand that when 2 different users checkout a file and both make
> > changes, then subversion will merge these by default. I understand that the
> > changes are committed to the repository, and only flag a conflict if changes
> > have been made by both users in the same line of the file.
> >
> > However, in my situation, I would never want merging of files to occur. I
> > would always want a conflict to be flagged.
> >
> > Is this possible in Subversion? If so:
> >
> > 1. how do I configure it for this?
> > 2. Can one repository on a server be configured for merging to be on, and
> > another for it to be off?
>
> You can set this up, but it's client side, not per-repository (yes, we
> agree that it would be nice to be able to configure things on a
> per-repository basis, but right now you can't). Just set the users
> diff3-cmd to something that always fails without doing anything
> (/bin/false comes to mind). This can be either set on the command line
> (the --diff3-cmd option) or in the users ~/.subversion/config file (the
> diff3-cmd in the [helpers] group).
Or, if appropriate, you can set the 'svn:mime-type' property on the files
concerned to a format that svn won't recognise as text. That way you don't
have to change the configuration of each client. (And you can use
auto-props to add the properties to new files...).
(Perhaps there should be an 'svn:merge-method' property, to allow
fine-tuning of the way merging is performed, in a platform-independent way
- eg it could contain "text" to use the usual text-based merge (even on
files with apparently binary mimetypes); "none" to report a conflict in
all cases; "foo" to run "foo.sh" on Unix or "foo.bat" on Windows, etc...)
Just a thought...
Patrick
--
The easy way to type accents in Windows: http://www.frkeys.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merging files
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
John McClement wrote:
> I am evaluating subversion and am tring to understand one feature. I
> understand that when 2 different users checkout a file and both make
> changes, then subversion will merge these by default. I understand that the
> changes are committed to the repository, and only flag a conflict if changes
> have been made by both users in the same line of the file.
>
> However, in my situation, I would never want merging of files to occur. I
> would always want a conflict to be flagged.
>
> Is this possible in Subversion? If so:
>
> 1. how do I configure it for this?
> 2. Can one repository on a server be configured for merging to be on, and
> another for it to be off?
You can set this up, but it's client side, not per-repository (yes, we
agree that it would be nice to be able to configure things on a
per-repository basis, but right now you can't). Just set the users
diff3-cmd to something that always fails without doing anything
(/bin/false comes to mind). This can be either set on the command line
(the --diff3-cmd option) or in the users ~/.subversion/config file (the
diff3-cmd in the [helpers] group).
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org