You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Michael Reinelt <mi...@reinelt.co.at> on 2008/07/23 12:45:22 UTC
svn 1.5 merge tracking svn:mergeinfo and svn diff --summarize
Hi there,
I've been using subversion for several years now with great success, but
1.5 doesn't work any longer with my specific setup.
I am managing customer-specific configurations and scripts for another
software product with svn. I don't use tags, but I use branches (every
customer has two branches: one for the production system, and one for
the test system). And there's trunk, which consists of files that should
be the same at every customer.
Changes are made either at the test or the production system, committed
and ported to the other branch. To find out wether something has changed
in either branch, I'm using "svn diff --summarize <URL of branch 1> <URL
of branch 2>", which has been working great in the past!
Now with the new merge-tracking feature of svn-1.5, there is a new
property called svn:mergeinfo, and as soon as I merge something, this
property will change, resulting in a diff reported by 'svn diff
--summarize'.
Even worse, I somehow managed to merge this property difference into the
other branch, and after a few minutes, I hat such a mess, that I had to
restore the whole repository, and downgraded to 1.4 again.
So here are my questions:
- is there a possibility to deactivate the whole merge-tracking with
1.5? (I don't need it at the moment, maybe later)
- is there a way to tell 'svn diff' and 'svn merge' to ignore the
svn:mergeinfo property? (other properties must not be ignored, they are
important for my setup and need to be ported from one branch to the other)
Thanks a lot for every hint!
bye, Michael
--
Michael Reinelt <mi...@reinelt.co.at>
http://home.pages.at/reinelt
GPG-Key 0xDF13BA50
ICQ #288386781
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn 1.5 merge tracking svn:mergeinfo and svn diff --summarize
Posted by Michael Reinelt <mi...@reinelt.co.at>.
Hi Mark,
>>>> - is there a possibility to deactivate the whole merge-tracking with
>>>> 1.5? (I don't need it at the moment, maybe later)
>>> Just keep your repository at the 1.4 format. Do not run svnadmin upgrade on it.
>> Well, I did not. I didn't even know that I should/could upgrade....
>>
>> I did not test wether the tracking itself works, I just noticed that
>> these properties have been set. Maybe the client should not touch these
>> properties with an 1.4 repo?
>
> The Subversion 1.5 client will not create or set mergeinfo properties
> with a 1.4 repository. At least not when merges are performed. I
> might have seen someone suggest that a rename creates and commits
> these properties, but I have not seen confirmation or an issue filed.
Would it be of any help if I'd prepare a test scenario with a 1.4 repo
and a 1.5 client creating this properties?
The only thing I remember that some of the merges have been "replaces"
indicated by a capital R in the first colunm of 'svn stat'. Maybe this
is the reason?
>>>> - is there a way to tell 'svn diff' and 'svn merge' to ignore the
>>>> svn:mergeinfo property?
> AFAIK, no one has asked to have svn:mergeinfo excluded from diff output.
Well, then I'm the first one raising his hand :-)
Shall I ask somewhere else, too?
TIA, Michael
--
Michael Reinelt <mi...@reinelt.co.at>
http://home.pages.at/reinelt
GPG-Key 0xDF13BA50
ICQ #288386781
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn 1.5 merge tracking svn:mergeinfo and svn diff --summarize
Posted by Mark Phippard <ma...@gmail.com>.
On Wed, Jul 23, 2008 at 11:04 AM, Michael Reinelt <mi...@reinelt.co.at> wrote:
>> On Wed, Jul 23, 2008 at 8:45 AM, Michael Reinelt <mi...@reinelt.co.at> wrote:
>>
>>> - is there a possibility to deactivate the whole merge-tracking with
>>> 1.5? (I don't need it at the moment, maybe later)
>>
>> Just keep your repository at the 1.4 format. Do not run svnadmin upgrade on it.
> Well, I did not. I didn't even know that I should/could upgrade....
>
> I did not test wether the tracking itself works, I just noticed that
> these properties have been set. Maybe the client should not touch these
> properties with an 1.4 repo?
The Subversion 1.5 client will not create or set mergeinfo properties
with a 1.4 repository. At least not when merges are performed. I
might have seen someone suggest that a rename creates and commits
these properties, but I have not seen confirmation or an issue filed.
>>> - is there a way to tell 'svn diff' and 'svn merge' to ignore the
>>> svn:mergeinfo property? (other properties must not be ignored, they are
>>> important for my setup and need to be ported from one branch to the other)
>>
>> Not currently. These changes also show in svn log.
>
> Too bad. This means I have to stick with 1.4?
I do not think you need to. The Subclipse repository, hosted at
tigris, runs SVN 1.3. It does not have any mergeinfo properties being
created. And I use 1.5 as client exclusively.
> Will this be corrected^Wimplemented someday? SHall I report it somewhere
> else?
AFAIK, no one has asked to have svn:mergeinfo excluded from diff output.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn 1.5 merge tracking svn:mergeinfo and svn diff --summarize
Posted by Michael Reinelt <mi...@reinelt.co.at>.
Hi Mark,
> On Wed, Jul 23, 2008 at 8:45 AM, Michael Reinelt <mi...@reinelt.co.at> wrote:
>
>> - is there a possibility to deactivate the whole merge-tracking with
>> 1.5? (I don't need it at the moment, maybe later)
>
> Just keep your repository at the 1.4 format. Do not run svnadmin upgrade on it.
Well, I did not. I didn't even know that I should/could upgrade....
I did not test wether the tracking itself works, I just noticed that
these properties have been set. Maybe the client should not touch these
properties with an 1.4 repo?
>> - is there a way to tell 'svn diff' and 'svn merge' to ignore the
>> svn:mergeinfo property? (other properties must not be ignored, they are
>> important for my setup and need to be ported from one branch to the other)
>
> Not currently. These changes also show in svn log.
Too bad. This means I have to stick with 1.4?
Will this be corrected^Wimplemented someday? SHall I report it somewhere
else?
--
Michael Reinelt <mi...@reinelt.co.at>
http://home.pages.at/reinelt
GPG-Key 0xDF13BA50
ICQ #288386781
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svn 1.5 merge tracking svn:mergeinfo and svn diff --summarize
Posted by Mark Phippard <ma...@gmail.com>.
On Wed, Jul 23, 2008 at 8:45 AM, Michael Reinelt <mi...@reinelt.co.at> wrote:
> - is there a possibility to deactivate the whole merge-tracking with
> 1.5? (I don't need it at the moment, maybe later)
Just keep your repository at the 1.4 format. Do not run svnadmin upgrade on it.
> - is there a way to tell 'svn diff' and 'svn merge' to ignore the
> svn:mergeinfo property? (other properties must not be ignored, they are
> important for my setup and need to be ported from one branch to the other)
Not currently. These changes also show in svn log.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org