You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Karl Fogel <kf...@red-bean.com> on 2008/03/07 06:19:24 UTC
Merging and gratuitous display of explicit mergeinfo.
At http://pastebin.ca/931468, you can see some merge behavior that
surprised me. I merged one revision from trunk to branch, affecting
two files. But afterwards, my formerly pristine branch working copy
showed *10* files changed: two of them were the ones I expected, and
the others had property changes to -- you guessed it -- svn:mergeinfo.
Am I merely revisiting an old discussion here? Has this been hashed
out already? Was it already proposed that 'svn status' and 'svn diff'
not show changes to svn:mergeinfo by default (and take a -g flag to
mean "do count svn:mergeinfo property changes")?
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging and gratuitous display of explicit mergeinfo.
Posted by Karl Fogel <kf...@red-bean.com>.
"David Glasser" <gl...@davidglasser.net> writes:
> Just to double-check: this isn't a pre-repository-refresh wc, is it?
Nope. I re-checked-out after cmpilato's rain dance.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging and gratuitous display of explicit mergeinfo.
Posted by David Glasser <gl...@davidglasser.net>.
On Thu, Mar 6, 2008 at 10:19 PM, Karl Fogel <kf...@red-bean.com> wrote:
> At http://pastebin.ca/931468, you can see some merge behavior that
> surprised me. I merged one revision from trunk to branch, affecting
> two files. But afterwards, my formerly pristine branch working copy
> showed *10* files changed: two of them were the ones I expected, and
> the others had property changes to -- you guessed it -- svn:mergeinfo.
>
> Am I merely revisiting an old discussion here? Has this been hashed
> out already? Was it already proposed that 'svn status' and 'svn diff'
> not show changes to svn:mergeinfo by default (and take a -g flag to
> mean "do count svn:mergeinfo property changes")?
Just to double-check: this isn't a pre-repository-refresh wc, is it?
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging and gratuitous display of explicit mergeinfo.
Posted by Paul Burba <pt...@gmail.com>.
On Fri, Mar 7, 2008 at 10:04 AM, Hyrum K. Wright
<hy...@mail.utexas.edu> wrote:
>
<snip>
> Hmm, I could have sworn that I did a re-checkout of all my working
> copies post-cmpilato's upgrade. I thought the mergeinfo conversion
> happened at the same time as the upgrade,
There was definitely a window:
Feb 29 11:38:56 *cmpilato has changed the topic to: Subversion
development | svn.collab.net is down for upgrade to 1.5.0-alpha2
.
.
The question of 'What to do about our repository' is resolved
http://svn.haxx.se/dev/archive-2008-03/0107.shtml
.
.
Mar 05 11:29:03 *cmpilato has changed the topic to: Subversion
development discussion | CHECKOUT NEW WORKING COPIES OF SVN.COLLAB.NET
REPOSITORIES
> but if it didn't, I can see
> how a window would have opened up to allow this to happen.
>
> In any case, I'm sorry if I screwed stuff up. :(
That doesn't even qualify as a screw up! If that's as bad as it gets
we are doing ok.
> > C:\SVN>svn co http://svn.collab.net/repos/svn/branches/1.5.x@29758 1.5.x -q
> >
> > C:\SVN>svn pg svn:mergeinfo -R 1.5.x
> > 1.5.x - /trunk:1-29080,29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,29174,29176-29186,29189,29193-
> > 29194,29198-29200,29202-29206,29208-29251,29254-29256,29261,29267-29273,29277,29280-29281,29284,29287-29303,29305-29307,29309-29325,29327-29343,29345-29348
> > ,29358-29379,29381-29392,29397,29399,29401,29409,29412,29414-29415,29417-29423,29425-29426,29429,29433-29434,29436-29438,29440-29447,29449-29466,29468-2947
> > 8,29482,29484,29486-29487,29489,29491,29493,29496,29498,29508,29527-29528,29539-29540,29546,29553,29556,29559,29565,29567-29569,29571-29578,29583,29591,295
> > 94,29614,29619,29623,29625-29626,29634,29671-29672
> >
> > C:\SVN>svn merge http://svn.collab.net/repos/svn/trunk 1.5.x -c29678
> > --- Merging r29678 into '1.5.x':
> > U 1.5.x\subversion\tests\cmdline\getopt_tests.py
> >
> > C:\SVN>svn st 1.5.x
> > M 1.5.x
> > M 1.5.x\subversion\tests\cmdline\getopt_tests.py
> >
> > C:\SVN>svn pg svn:mergeinfo 1.5.x -R
> > 1.5.x - /trunk:1-29080,29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,29174,29176-29186,29189,29193-
> > 29194,29198-29200,29202-29206,29208-29251,29254-29256,29261,29267-29273,29277,29280-29281,29284,29287-29303,29305-29307,29309-29325,29327-29343,29345-29348
> > ,29358-29379,29381-29392,29397,29399,29401,29409,29412,29414-29415,29417-29423,29425-29426,29429,29433-29434,29436-29438,29440-29447,29449-29466,29468-2947
> > 8,29482,29484,29486-29487,29489,29491,29493,29496,29498,29508,29527-29528,29539-29540,29546,29553,29556,29559,29565,29567-29569,29571-29578,29583,29591,295
> > 94,29614,29619,29623,29625-29626,29634,29671-29672,29678
> >
> > Seems if we just remove the mergeinfo on the six files in 1.5.x and
> > commit that, this problem will go away no?
>
> That *sounds* right, but my knowledge of the inner workings of mergeinfo
> is a bit shaky.
If no one objects I'll do this shortly.
Paul
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging and gratuitous display of explicit mergeinfo.
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
Paul Burba wrote:
> On Fri, Mar 7, 2008 at 9:22 AM, Paul Burba <pt...@gmail.com> wrote:
>> On Fri, Mar 7, 2008 at 1:19 AM, Karl Fogel <kf...@red-bean.com> wrote:
>> > At http://pastebin.ca/931468, you can see some merge behavior that
>> > surprised me. I merged one revision from trunk to branch, affecting
>> > two files. But afterwards, my formerly pristine branch working copy
>> > showed *10* files changed: two of them were the ones I expected, and
>> > the others had property changes to -- you guessed it -- svn:mergeinfo.
>>
>> A theory on what might have happened:
>>
>> 1) These files all had explicit svn:mergeinfo in trunk and 1.5.x:
>>
>>
>> www/images/subversion-diagram.png
>>
>> www/images/subversion_logo-200x173.png
>>
>> www/images/subversion_logo_hor-468x64.png
>>
>> www/images/subversion_logo-384x332.png
>> notes/reintegrate-todo.txt
>>
>> notes/tree-conflicts/scratch-pad.txt
>>
>> 2) Mike upgrades the server to 1.5.0 alpha 2
>>
>> 3) Hyrum checks out a new 1.5.x WC, which includes explicit mergeinfo
>> on the six files.
>>
>> 4) Mike filters out all existing mergeinfo from the repository and
>> converts svnmerge-integrated props to svn:mergeinfo. The six files in
>> 1) no longer have mergeinfo.
>>
>> 6) In r29759 Hyrum merges some changes from trunk to his 1.5.x WC,
>> which still has explicit mergeinfo on the 'six'. This mergeinfo
>> doesn't exist in the repository so when he commits the backport we see
>> mergeinfo added to the six files:
>>
>> C:\SVN\src-branch>svn info
>> Path: .
>> URL: http://svn.collab.net/repos/svn/branches/1.5.x
>> Repository Root: http://svn.collab.net/repos/svn
>> Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
>> Revision: 29766
>> Node Kind: directory
>> Schedule: normal
>> Last Changed Author: kfogel
>> Last Changed Rev: 29766
>> Last Changed Date: 2008-03-07 01:30:08 -0500 (Fri, 07 Mar 2008)
>>
>> C:\SVN\src-branch>svn diff -r29758:29759 www
>>
>> Property changes on: www\images\subversion-diagram.png
>> ___________________________________________________________________
>> Added: svn:mergeinfo
>> Merged /trunk/www/images/subversion-diagram.png:r29567-29568,29578,29678
>>
>>
>> Property changes on: www\images\subversion_logo-200x173.png
>> ___________________________________________________________________
>> Added: svn:mergeinfo
>> Merged /trunk/www/images/subversion_logo-200x173.png:r29567-29568,29578,29678
>>
>>
>> Property changes on: www\images\subversion_logo_hor-468x64.png
>> ___________________________________________________________________
>> Added: svn:mergeinfo
>> Merged /trunk/www/images/subversion_logo_hor-468x64.png:r29567-29568,29578,29678
>>
>>
>> Property changes on: www\images\subversion_logo-384x332.png
>> ___________________________________________________________________
>> Added: svn:mergeinfo
>> Merged /trunk/www/images/subversion_logo-384x332.png:r29567-29568,29578,29678
>>
>> C:\SVN\src-branch>svn diff -r29758:29759 notes
>>
>> Property changes on: notes\reintegrate-todo.txt
>> ___________________________________________________________________
>> Added: svn:mergeinfo
>> Merged /branches/sqlite-mergeinfo-without-mergeinfo/reintegrate-branch-TODO:r28127-28195
>> Merged /branches/whole-branch-merge/reintegrate-branch-TODO:r28245-28427
>> Merged /branches/reintegrate/reintegrate-branch-TODO:r28428-28977
>> Merged /trunk/notes/reintegrate-todo.txt:r29567-29568,29578,29678
>> Merged /branches/sqlite-deep-copies/reintegrate-branch-TODO:r28196-28244
>> Merged /branches/sqlite-node-origins/reintegrate-branch-TODO:r27841-27889
>> Merged /branches/mergeinfoless-copies/reintegrate-branch-TODO:r27771-28001
>>
>>
>> Property changes on: notes\tree-conflicts\scratch-pad.txt
>> ___________________________________________________________________
>> Added: svn:mergeinfo
>> Merged /trunk/notes/tree-conflicts/scratch-pad.txt:r29567-29568,29578,29678
>>
>> 7) Now Karl updates his 1.5.x WC or checks out a new one, either way
>> he gets the subtree mergeinfo from 6, so diff/stat aren't going to
>> show anything unusual.
>>
>> Paul
>
> This definitely seems to be what happened, if I checkout a shiny new
> WC and attempt to replicate Hyrum's r29759, there is not explicit
> mergeinfo on the six and none gets set/modified (except on the root of
> course):
Hmm, I could have sworn that I did a re-checkout of all my working
copies post-cmpilato's upgrade. I thought the mergeinfo conversion
happened at the same time as the upgrade, but if it didn't, I can see
how a window would have opened up to allow this to happen.
In any case, I'm sorry if I screwed stuff up. :(
> C:\SVN>svn co http://svn.collab.net/repos/svn/branches/1.5.x@29758 1.5.x -q
>
> C:\SVN>svn pg svn:mergeinfo -R 1.5.x
> 1.5.x - /trunk:1-29080,29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,29174,29176-29186,29189,29193-
> 29194,29198-29200,29202-29206,29208-29251,29254-29256,29261,29267-29273,29277,29280-29281,29284,29287-29303,29305-29307,29309-29325,29327-29343,29345-29348
> ,29358-29379,29381-29392,29397,29399,29401,29409,29412,29414-29415,29417-29423,29425-29426,29429,29433-29434,29436-29438,29440-29447,29449-29466,29468-2947
> 8,29482,29484,29486-29487,29489,29491,29493,29496,29498,29508,29527-29528,29539-29540,29546,29553,29556,29559,29565,29567-29569,29571-29578,29583,29591,295
> 94,29614,29619,29623,29625-29626,29634,29671-29672
>
> C:\SVN>svn merge http://svn.collab.net/repos/svn/trunk 1.5.x -c29678
> --- Merging r29678 into '1.5.x':
> U 1.5.x\subversion\tests\cmdline\getopt_tests.py
>
> C:\SVN>svn st 1.5.x
> M 1.5.x
> M 1.5.x\subversion\tests\cmdline\getopt_tests.py
>
> C:\SVN>svn pg svn:mergeinfo 1.5.x -R
> 1.5.x - /trunk:1-29080,29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,29174,29176-29186,29189,29193-
> 29194,29198-29200,29202-29206,29208-29251,29254-29256,29261,29267-29273,29277,29280-29281,29284,29287-29303,29305-29307,29309-29325,29327-29343,29345-29348
> ,29358-29379,29381-29392,29397,29399,29401,29409,29412,29414-29415,29417-29423,29425-29426,29429,29433-29434,29436-29438,29440-29447,29449-29466,29468-2947
> 8,29482,29484,29486-29487,29489,29491,29493,29496,29498,29508,29527-29528,29539-29540,29546,29553,29556,29559,29565,29567-29569,29571-29578,29583,29591,295
> 94,29614,29619,29623,29625-29626,29634,29671-29672,29678
>
> Seems if we just remove the mergeinfo on the six files in 1.5.x and
> commit that, this problem will go away no?
That *sounds* right, but my knowledge of the inner workings of mergeinfo
is a bit shaky.
-Hyrum
Re: Merging and gratuitous display of explicit mergeinfo.
Posted by Paul Burba <pt...@gmail.com>.
On Fri, Mar 7, 2008 at 9:22 AM, Paul Burba <pt...@gmail.com> wrote:
> On Fri, Mar 7, 2008 at 1:19 AM, Karl Fogel <kf...@red-bean.com> wrote:
> > At http://pastebin.ca/931468, you can see some merge behavior that
> > surprised me. I merged one revision from trunk to branch, affecting
> > two files. But afterwards, my formerly pristine branch working copy
> > showed *10* files changed: two of them were the ones I expected, and
> > the others had property changes to -- you guessed it -- svn:mergeinfo.
>
> A theory on what might have happened:
>
> 1) These files all had explicit svn:mergeinfo in trunk and 1.5.x:
>
>
> www/images/subversion-diagram.png
>
> www/images/subversion_logo-200x173.png
>
> www/images/subversion_logo_hor-468x64.png
>
> www/images/subversion_logo-384x332.png
> notes/reintegrate-todo.txt
>
> notes/tree-conflicts/scratch-pad.txt
>
> 2) Mike upgrades the server to 1.5.0 alpha 2
>
> 3) Hyrum checks out a new 1.5.x WC, which includes explicit mergeinfo
> on the six files.
>
> 4) Mike filters out all existing mergeinfo from the repository and
> converts svnmerge-integrated props to svn:mergeinfo. The six files in
> 1) no longer have mergeinfo.
>
> 6) In r29759 Hyrum merges some changes from trunk to his 1.5.x WC,
> which still has explicit mergeinfo on the 'six'. This mergeinfo
> doesn't exist in the repository so when he commits the backport we see
> mergeinfo added to the six files:
>
> C:\SVN\src-branch>svn info
> Path: .
> URL: http://svn.collab.net/repos/svn/branches/1.5.x
> Repository Root: http://svn.collab.net/repos/svn
> Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
> Revision: 29766
> Node Kind: directory
> Schedule: normal
> Last Changed Author: kfogel
> Last Changed Rev: 29766
> Last Changed Date: 2008-03-07 01:30:08 -0500 (Fri, 07 Mar 2008)
>
> C:\SVN\src-branch>svn diff -r29758:29759 www
>
> Property changes on: www\images\subversion-diagram.png
> ___________________________________________________________________
> Added: svn:mergeinfo
> Merged /trunk/www/images/subversion-diagram.png:r29567-29568,29578,29678
>
>
> Property changes on: www\images\subversion_logo-200x173.png
> ___________________________________________________________________
> Added: svn:mergeinfo
> Merged /trunk/www/images/subversion_logo-200x173.png:r29567-29568,29578,29678
>
>
> Property changes on: www\images\subversion_logo_hor-468x64.png
> ___________________________________________________________________
> Added: svn:mergeinfo
> Merged /trunk/www/images/subversion_logo_hor-468x64.png:r29567-29568,29578,29678
>
>
> Property changes on: www\images\subversion_logo-384x332.png
> ___________________________________________________________________
> Added: svn:mergeinfo
> Merged /trunk/www/images/subversion_logo-384x332.png:r29567-29568,29578,29678
>
> C:\SVN\src-branch>svn diff -r29758:29759 notes
>
> Property changes on: notes\reintegrate-todo.txt
> ___________________________________________________________________
> Added: svn:mergeinfo
> Merged /branches/sqlite-mergeinfo-without-mergeinfo/reintegrate-branch-TODO:r28127-28195
> Merged /branches/whole-branch-merge/reintegrate-branch-TODO:r28245-28427
> Merged /branches/reintegrate/reintegrate-branch-TODO:r28428-28977
> Merged /trunk/notes/reintegrate-todo.txt:r29567-29568,29578,29678
> Merged /branches/sqlite-deep-copies/reintegrate-branch-TODO:r28196-28244
> Merged /branches/sqlite-node-origins/reintegrate-branch-TODO:r27841-27889
> Merged /branches/mergeinfoless-copies/reintegrate-branch-TODO:r27771-28001
>
>
> Property changes on: notes\tree-conflicts\scratch-pad.txt
> ___________________________________________________________________
> Added: svn:mergeinfo
> Merged /trunk/notes/tree-conflicts/scratch-pad.txt:r29567-29568,29578,29678
>
> 7) Now Karl updates his 1.5.x WC or checks out a new one, either way
> he gets the subtree mergeinfo from 6, so diff/stat aren't going to
> show anything unusual.
>
> Paul
This definitely seems to be what happened, if I checkout a shiny new
WC and attempt to replicate Hyrum's r29759, there is not explicit
mergeinfo on the six and none gets set/modified (except on the root of
course):
C:\SVN>svn co http://svn.collab.net/repos/svn/branches/1.5.x@29758 1.5.x -q
C:\SVN>svn pg svn:mergeinfo -R 1.5.x
1.5.x - /trunk:1-29080,29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,29174,29176-29186,29189,29193-
29194,29198-29200,29202-29206,29208-29251,29254-29256,29261,29267-29273,29277,29280-29281,29284,29287-29303,29305-29307,29309-29325,29327-29343,29345-29348
,29358-29379,29381-29392,29397,29399,29401,29409,29412,29414-29415,29417-29423,29425-29426,29429,29433-29434,29436-29438,29440-29447,29449-29466,29468-2947
8,29482,29484,29486-29487,29489,29491,29493,29496,29498,29508,29527-29528,29539-29540,29546,29553,29556,29559,29565,29567-29569,29571-29578,29583,29591,295
94,29614,29619,29623,29625-29626,29634,29671-29672
C:\SVN>svn merge http://svn.collab.net/repos/svn/trunk 1.5.x -c29678
--- Merging r29678 into '1.5.x':
U 1.5.x\subversion\tests\cmdline\getopt_tests.py
C:\SVN>svn st 1.5.x
M 1.5.x
M 1.5.x\subversion\tests\cmdline\getopt_tests.py
C:\SVN>svn pg svn:mergeinfo 1.5.x -R
1.5.x - /trunk:1-29080,29085-29089,29091,29094-29107,29111,29114,29117,29126-29127,29129-29133,29135-29150,29153-29164,29166,29174,29176-29186,29189,29193-
29194,29198-29200,29202-29206,29208-29251,29254-29256,29261,29267-29273,29277,29280-29281,29284,29287-29303,29305-29307,29309-29325,29327-29343,29345-29348
,29358-29379,29381-29392,29397,29399,29401,29409,29412,29414-29415,29417-29423,29425-29426,29429,29433-29434,29436-29438,29440-29447,29449-29466,29468-2947
8,29482,29484,29486-29487,29489,29491,29493,29496,29498,29508,29527-29528,29539-29540,29546,29553,29556,29559,29565,29567-29569,29571-29578,29583,29591,295
94,29614,29619,29623,29625-29626,29634,29671-29672,29678
Seems if we just remove the mergeinfo on the six files in 1.5.x and
commit that, this problem will go away no?
Paul
> > Am I merely revisiting an old discussion here? Has this been hashed
> > out already? Was it already proposed that 'svn status' and 'svn diff'
> > not show changes to svn:mergeinfo by default (and take a -g flag to
> > mean "do count svn:mergeinfo property changes")?
>
> Not sure what svn st
^^^
ignore, just an incomplete thought.
> > -Karl
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging and gratuitous display of explicit mergeinfo.
Posted by Paul Burba <pt...@gmail.com>.
On Fri, Mar 7, 2008 at 1:19 AM, Karl Fogel <kf...@red-bean.com> wrote:
> At http://pastebin.ca/931468, you can see some merge behavior that
> surprised me. I merged one revision from trunk to branch, affecting
> two files. But afterwards, my formerly pristine branch working copy
> showed *10* files changed: two of them were the ones I expected, and
> the others had property changes to -- you guessed it -- svn:mergeinfo.
A theory on what might have happened:
1) These files all had explicit svn:mergeinfo in trunk and 1.5.x:
www/images/subversion-diagram.png
www/images/subversion_logo-200x173.png
www/images/subversion_logo_hor-468x64.png
www/images/subversion_logo-384x332.png
notes/reintegrate-todo.txt
notes/tree-conflicts/scratch-pad.txt
2) Mike upgrades the server to 1.5.0 alpha 2
3) Hyrum checks out a new 1.5.x WC, which includes explicit mergeinfo
on the six files.
4) Mike filters out all existing mergeinfo from the repository and
converts svnmerge-integrated props to svn:mergeinfo. The six files in
1) no longer have mergeinfo.
6) In r29759 Hyrum merges some changes from trunk to his 1.5.x WC,
which still has explicit mergeinfo on the 'six'. This mergeinfo
doesn't exist in the repository so when he commits the backport we see
mergeinfo added to the six files:
C:\SVN\src-branch>svn info
Path: .
URL: http://svn.collab.net/repos/svn/branches/1.5.x
Repository Root: http://svn.collab.net/repos/svn
Repository UUID: 612f8ebc-c883-4be0-9ee0-a4e9ef946e3a
Revision: 29766
Node Kind: directory
Schedule: normal
Last Changed Author: kfogel
Last Changed Rev: 29766
Last Changed Date: 2008-03-07 01:30:08 -0500 (Fri, 07 Mar 2008)
C:\SVN\src-branch>svn diff -r29758:29759 www
Property changes on: www\images\subversion-diagram.png
___________________________________________________________________
Added: svn:mergeinfo
Merged /trunk/www/images/subversion-diagram.png:r29567-29568,29578,29678
Property changes on: www\images\subversion_logo-200x173.png
___________________________________________________________________
Added: svn:mergeinfo
Merged /trunk/www/images/subversion_logo-200x173.png:r29567-29568,29578,29678
Property changes on: www\images\subversion_logo_hor-468x64.png
___________________________________________________________________
Added: svn:mergeinfo
Merged /trunk/www/images/subversion_logo_hor-468x64.png:r29567-29568,29578,29678
Property changes on: www\images\subversion_logo-384x332.png
___________________________________________________________________
Added: svn:mergeinfo
Merged /trunk/www/images/subversion_logo-384x332.png:r29567-29568,29578,29678
C:\SVN\src-branch>svn diff -r29758:29759 notes
Property changes on: notes\reintegrate-todo.txt
___________________________________________________________________
Added: svn:mergeinfo
Merged /branches/sqlite-mergeinfo-without-mergeinfo/reintegrate-branch-TODO:r28127-28195
Merged /branches/whole-branch-merge/reintegrate-branch-TODO:r28245-28427
Merged /branches/reintegrate/reintegrate-branch-TODO:r28428-28977
Merged /trunk/notes/reintegrate-todo.txt:r29567-29568,29578,29678
Merged /branches/sqlite-deep-copies/reintegrate-branch-TODO:r28196-28244
Merged /branches/sqlite-node-origins/reintegrate-branch-TODO:r27841-27889
Merged /branches/mergeinfoless-copies/reintegrate-branch-TODO:r27771-28001
Property changes on: notes\tree-conflicts\scratch-pad.txt
___________________________________________________________________
Added: svn:mergeinfo
Merged /trunk/notes/tree-conflicts/scratch-pad.txt:r29567-29568,29578,29678
7) Now Karl updates his 1.5.x WC or checks out a new one, either way
he gets the subtree mergeinfo from 6, so diff/stat aren't going to
show anything unusual.
Paul
> Am I merely revisiting an old discussion here? Has this been hashed
> out already? Was it already proposed that 'svn status' and 'svn diff'
> not show changes to svn:mergeinfo by default (and take a -g flag to
> mean "do count svn:mergeinfo property changes")?
Not sure what svn st
> -Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Merging and gratuitous display of explicit mergeinfo.
Posted by "Hyrum K. Wright" <hy...@mail.utexas.edu>.
Karl Fogel wrote:
> Karl Fogel <kf...@red-bean.com> writes:
>> At http://pastebin.ca/931468, you can see some merge behavior that
>> surprised me. I merged one revision from trunk to branch, affecting
>> two files. But afterwards, my formerly pristine branch working copy
>> showed *10* files changed: two of them were the ones I expected, and
>> the others had property changes to -- you guessed it -- svn:mergeinfo.
>>
>> Am I merely revisiting an old discussion here? Has this been hashed
>> out already? Was it already proposed that 'svn status' and 'svn diff'
>> not show changes to svn:mergeinfo by default (and take a -g flag to
>> mean "do count svn:mergeinfo property changes")?
>
> epg expressed interest in seeing the diff output too, so here it is:
>
> http://pastebin.ca/931473
FWIW, I've been seeing similar output (under the same conditions:
pristine WC, rechecked out from the "new" repository) when doing merges
to 1.5.x. See r29764 and r29765 for details.
-Hyrum
Re: Merging and gratuitous display of explicit mergeinfo.
Posted by "C. Michael Pilato" <cm...@collab.net>.
Karl Fogel wrote:
> Karl Fogel <kf...@red-bean.com> writes:
>> At http://pastebin.ca/931468, you can see some merge behavior that
>> surprised me. I merged one revision from trunk to branch, affecting
>> two files. But afterwards, my formerly pristine branch working copy
>> showed *10* files changed: two of them were the ones I expected, and
>> the others had property changes to -- you guessed it -- svn:mergeinfo.
>>
>> Am I merely revisiting an old discussion here? Has this been hashed
>> out already? Was it already proposed that 'svn status' and 'svn diff'
>> not show changes to svn:mergeinfo by default (and take a -g flag to
>> mean "do count svn:mergeinfo property changes")?
>
> epg expressed interest in seeing the diff output too, so here it is:
>
> http://pastebin.ca/931473
This appears to be repeatable.
$ cd projects/subversion-1.5.x
$ svn up -q -r 29765 ## rev just prior to karl's commit
$ svn merge -c 29188 http://svn.collab.net/repos/svn/trunk .
--- Merging r29188 into '.':
U subversion/libsvn_wc/adm_ops.c
Conflict discovered in 'subversion/svn/conflict-callbacks.c'.
Select: (p) postpone, (df) diff-full, (e) edit,
(h) help for more options: e
Waiting for Emacs...Done
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
(h) help for more options: r
U subversion/svn/conflict-callbacks.c
$ svn st
M .
M www/images/subversion-diagram.png
M www/images/subversion_logo-200x173.png
M www/images/subversion_logo_hor-468x64.png
M www/images/subversion_logo-384x332.png
M notes/reintegrate-todo.txt
M notes/tree-conflicts/scratch-pad.txt
M subversion/libsvn_wc/adm_ops.c
M subversion/svn/conflict-callbacks.c
M CHANGES
$
But on closer inspection, it's not quite the same:
$ svn diff -N
Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
Merged /trunk:r29188
Property changes on: CHANGES
___________________________________________________________________
Modified: svn:mergeinfo
Merged /trunk/CHANGES:r29188
$
Those mergeinfo props do at least actually refer to the revision I merged
instead of ... something else.
NOTE: I'm using a trunk build from sometime yesterday.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Distributed Development On Demand
Re: Merging and gratuitous display of explicit mergeinfo.
Posted by Karl Fogel <kf...@red-bean.com>.
Karl Fogel <kf...@red-bean.com> writes:
> At http://pastebin.ca/931468, you can see some merge behavior that
> surprised me. I merged one revision from trunk to branch, affecting
> two files. But afterwards, my formerly pristine branch working copy
> showed *10* files changed: two of them were the ones I expected, and
> the others had property changes to -- you guessed it -- svn:mergeinfo.
>
> Am I merely revisiting an old discussion here? Has this been hashed
> out already? Was it already proposed that 'svn status' and 'svn diff'
> not show changes to svn:mergeinfo by default (and take a -g flag to
> mean "do count svn:mergeinfo property changes")?
epg expressed interest in seeing the diff output too, so here it is:
http://pastebin.ca/931473
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org