Maybe the merge updated the svn:mergeinfo property on that file? svn
log does not tell you what changed (text or props). I'd think svn
diff of the revision would report it though.
On Sun, Jun 7, 2009 at 8:45 AM, Karl Heinz Marbaise<khmarbaise_at_gmx.de> wrote:
> Hi,
>
> i have observed a little bit strange behaviour during an svn merge...
>
> The story..
>
> I have created a stable line as a branch /branches/0.6-stable (svn cp
> URL/trunk URL/branches/0.6-stable (357)
>
> I have fixed a bug on trunk in revision 358.
>
> Now i have merged the single revision 358 to the branch.
>
> Checkout the branch:
>
> svn merge -c 358 URL/trunk
>
> svn ci -m"- ..."
>
> But the result was a little curious...
>
> If i take a look at the trunk (357)
> > svn log -v http://svn.supose.org/supose
>
> ------------------------------------------------------------------------
> r358 | kama | 2009-06-06 16:31:17 +0200 (Sat, 06 Jun 2009) | 3 lines
> Changed paths:
> M /trunk/changes.xml
>
> - Fixed #207
> - fixed date for Release 0.6.0
>
> But if i check on the branch (after the merge):
> > svn log -v http://svn.supose.org/supose/branches/0.6-stable
>
> ------------------------------------------------------------------------
> r359 | kama | 2009-06-06 16:36:05 +0200 (Sat, 06 Jun 2009) | 3 lines
> Changed paths:
> M /branches/0.6-stable
> M /branches/0.6-stable/changes.xml
> M /branches/0.6-stable/src/site/apt/commandline-search.apt
>
> - refs #207
> - Merged r358 (trunk) to branch /branches/0.6-stable
>
> ------------------------------------------------------------------------
> r357 | kama | 2009-06-06 16:28:50 +0200 (Sat, 06 Jun 2009) | 1 line
> Changed paths:
> A /branches/0.6-stable (from /trunk:356)
>
> - The first stable line.
> ------------------------------------------------------------------------
>
>
> I have checked the changes for commandline-search.apt on the branch, but
> there is no change and on the trunk only the changes.xml files has been
> changed...
>
> The mergeinfo property seemed to be ok.
>
> > svn pl http://svn.supose.org/supose/branches/0.6-stable@359 -v
> Properties on 'http://svn.supose.org/supose/branches/0.6-stable':
> bugtraq:url : http://www.supose.org/issues/show/%BUGID%
> svn:ignore : target
> test-output
> build
> dist
> .settings
>
> bugtraq:logregex : #(\d+)
> svn:mergeinfo : /branches/B_I146:170-174
> /branches/B_RECOGNITION_TAGSBRANCHES:245-270
> /branches/F184:242-254
> /branches/R_0.5.0.1:218-225
> /tags/R_0.5.0:193-217
> /trunk:358
>
>
> Is this a known bug or may be already solved in 1.5.X line ?
>
> Kind regards
> Karl Heinz Marbaise
> --
> SoftwareEntwicklung Beratung Schulung Tel.: +49 (0) 2405 / 415 893
> Dipl.Ing.(FH) Karl Heinz Marbaise ICQ#: 135949029
> Hauptstrasse 177 USt.IdNr: DE191347579
> 52146 Würselen http://www.soebes.de
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2360093
>
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2360098
Received on 2009-06-07 16:16:03 CEST