You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by "GENG, DAPENG (DAPENG)" <da...@alcatel-lucent.com> on 2012/02/28 07:24:03 UTC
Question: merge info is no updated after merge
Hello,
I recently discovered that merge info does not get updated after merge.
I've tried several times from one branch to taget branch. And merge info remains unchanged.
In target branch, there are existing merge info for previous merges. No more new merges are recorded since few weeks ago.
Can you please let me know what shall I check or what could be the reason?
I am using subversion 1.6.16-1820.64 with Eclipse 3.6.2 with CollabNet Desktop Merge.
Kind Regards,
Dapeng Geng
Alcatel.Lucent Australia
Professional Services / BSS & OSS BU
+61 2 8306 5413
Dapeng.Geng@alcatel-lucent.com<ma...@alcatel-lucent.com>
RE: Question: merge info is no updated after merge
Posted by "GENG, DAPENG (DAPENG)" <da...@alcatel-lucent.com>.
Thanks a lot Stephen.
I had a look on "Merges Without Mergeinfo". None of scenarios is matching.
Acctually, I did not do merge via commands but from Eclipse with subclipse plugin.
What I did is same as "Overview of CollabNet Merge Client" in this URL:
http://desktop-eclipse.open.collab.net/servlets/ProjectProcess?pageID=MEuUjb&freeformpage=Merge%20Client
The strange thing is that the mergeinfo was udpated correctly up to a certain point.
Merge is all good and files are merged correctly and merge logs are good too.
The only thing seems wrong is mergeinfo not udpated and all revisions merged will show up again when do merge again.
Just want to know if anything I can check to dig out the reason.
BTW, maybe you can also review our branch structure:
We are creating branches from branches, so:
Trunk--------
Branch 1-----------
Brnach 2-----------===========
Branch 3----------
What I did is merge =========== from branch 2 to branch 3.
Kind Regards,
Dapeng Geng
-----Original Message-----
From: Stephen Butler [mailto:sbutler@elego.de]
Sent: Tuesday, 28 February 2012 7:53 PM
To: GENG, DAPENG (DAPENG)
Cc: users@subversion.apache.org
Subject: Re: Question: merge info is no updated after merge
On Feb 28, 2012, at 8:56 , Stephen Butler wrote:
>
> On Feb 28, 2012, at 7:24 , GENG, DAPENG (DAPENG) wrote:
>
>> Hello,
>>
>> I recently discovered that merge info does not get updated after merge.
>>
>> I've tried several times from one branch to taget branch. And merge info remains unchanged.
Have a look at the SVN-Book section on "Merges Without Mergeinfo".
http://svnbook.red-bean.com/en/1.7/svn.branchmerge.advanced.html#svn.branchmerge.nomergedata
Do any of those scenarios match your situation?
>>
>> In target branch, there are existing merge info for previous merges. No more new merges are recorded since few weeks ago.
>
> Could you give an example of the kind of merges you are doing, starting
> from an empty repository? E.g.,
>
> svnadmin create repos
> svn mkdir file:///<cwd>/repos/trunk -m init
> svn co file:///<cwd>/repos/trunk trunk-wc
> cd trunk-wc
> echo "foo file" > foo.txt
> svn ci -m "add foo"
> svn mkdir ^/branches -m init
> svn cp ^/trunk ^/branches/mybranch -m "create branch"
> ...
>
> There are handy repro-script templates for Unix and Windows at
>
> http://subversion.apache.org/docs/community-guide/issues.html#reporting-bugs
>
>
>>
>> Can you please let me know what shall I check or what could be the reason?
>
> Perhaps the person committing the merge committed the subtrees containing
> merged files, but forgot to commit the working copy root directory? Assuming
> the merge was applied to the whole working copy, that's where the svn:mergeinfo
> property will be changed.
>
> Regards,
> Steve
>
>>
>> I am using subversion 1.6.16-1820.64 with Eclipse 3.6.2 with CollabNet Desktop Merge.
>>
>> Kind Regards,
>> Dapeng Geng
>> Alcatel.Lucent Australia
>> Professional Services / BSS & OSS BU
>> +61 2 8306 5413
>> Dapeng.Geng@alcatel-lucent.com
>>
>>
>
--
Stephen Butler | Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25, 13355 Berlin, Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elego.de
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719
Re: Question: merge info is no updated after merge
Posted by Stephen Butler <sb...@elego.de>.
On Feb 28, 2012, at 8:56 , Stephen Butler wrote:
>
> On Feb 28, 2012, at 7:24 , GENG, DAPENG (DAPENG) wrote:
>
>> Hello,
>>
>> I recently discovered that merge info does not get updated after merge.
>>
>> I’ve tried several times from one branch to taget branch. And merge info remains unchanged.
Have a look at the SVN-Book section on "Merges Without Mergeinfo".
http://svnbook.red-bean.com/en/1.7/svn.branchmerge.advanced.html#svn.branchmerge.nomergedata
Do any of those scenarios match your situation?
>>
>> In target branch, there are existing merge info for previous merges. No more new merges are recorded since few weeks ago.
>
> Could you give an example of the kind of merges you are doing, starting
> from an empty repository? E.g.,
>
> svnadmin create repos
> svn mkdir file:///<cwd>/repos/trunk -m init
> svn co file:///<cwd>/repos/trunk trunk-wc
> cd trunk-wc
> echo "foo file" > foo.txt
> svn ci -m "add foo"
> svn mkdir ^/branches -m init
> svn cp ^/trunk ^/branches/mybranch -m "create branch"
> ...
>
> There are handy repro-script templates for Unix and Windows at
>
> http://subversion.apache.org/docs/community-guide/issues.html#reporting-bugs
>
>
>>
>> Can you please let me know what shall I check or what could be the reason?
>
> Perhaps the person committing the merge committed the subtrees containing
> merged files, but forgot to commit the working copy root directory? Assuming
> the merge was applied to the whole working copy, that's where the svn:mergeinfo
> property will be changed.
>
> Regards,
> Steve
>
>>
>> I am using subversion 1.6.16-1820.64 with Eclipse 3.6.2 with CollabNet Desktop Merge.
>>
>> Kind Regards,
>> Dapeng Geng
>> Alcatel.Lucent Australia
>> Professional Services / BSS & OSS BU
>> +61 2 8306 5413
>> Dapeng.Geng@alcatel-lucent.com
>>
>>
>
--
Stephen Butler | Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25, 13355 Berlin, Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elego.de
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719
Re: Question: merge info is no updated after merge
Posted by Stephen Butler <sb...@elego.de>.
On Feb 28, 2012, at 7:24 , GENG, DAPENG (DAPENG) wrote:
> Hello,
>
> I recently discovered that merge info does not get updated after merge.
>
> I’ve tried several times from one branch to taget branch. And merge info remains unchanged.
>
> In target branch, there are existing merge info for previous merges. No more new merges are recorded since few weeks ago.
Could you give an example of the kind of merges you are doing, starting
from an empty repository? E.g.,
svnadmin create repos
svn mkdir file:///<cwd>/repos/trunk -m init
svn co file:///<cwd>/repos/trunk trunk-wc
cd trunk-wc
echo "foo file" > foo.txt
svn ci -m "add foo"
svn mkdir ^/branches -m init
svn cp ^/trunk ^/branches/mybranch -m "create branch"
...
There are handy repro-script templates for Unix and Windows at
http://subversion.apache.org/docs/community-guide/issues.html#reporting-bugs
>
> Can you please let me know what shall I check or what could be the reason?
Perhaps the person committing the merge committed the subtrees containing
merged files, but forgot to commit the working copy root directory? Assuming
the merge was applied to the whole working copy, that's where the svn:mergeinfo
property will be changed.
Regards,
Steve
>
> I am using subversion 1.6.16-1820.64 with Eclipse 3.6.2 with CollabNet Desktop Merge.
>
> Kind Regards,
> Dapeng Geng
> Alcatel.Lucent Australia
> Professional Services / BSS & OSS BU
> +61 2 8306 5413
> Dapeng.Geng@alcatel-lucent.com
>
>