Re: mergeinfo between svn copied branches and merges
Hi Andrew thanks for responding. On Tue, May 7, 2013 at 2:14 PM, Andrew Reedick andrew.reed...@cbeyond.netwrote: From: Z W [mailto:mpc8...@gmail.com] Sent: Tuesday, May 07, 2013 11:53 AM To: users@subversion.apache.org Subject: mergeinfo between svn copied branches and merges we have branchA we svn copy branchA to produce branchB branches A and B continues development and checkins branchA is merged to branch B continuously branchA finishes, tagged we then svn copy branchA to produce branchC we like to continue branchC merging to branchB we hear u clearly that the merge info are copied between branches we performed svn mergeinfo merged on branchB working copy with branchA we could see the correct list of merged rev numbers we performed svn mergeinfo eligible on branchB working copy with branch A; we see correct list of eligigle rev numbers we learn that these numbers are used by SVN to calculate what needs to be merged from branchB to branchA (-reintegrate) we performed svn mergeinfo merged on branchB working copy with branchC we see a new list (not including list of merged rev numbers from branchA) we learn that if we reintegrate from branchB to branchC, because those list of merged rev numbers from branchA are not there, SVN would not know those rev numbers changes already exist in branchC so SVN would try to reintegrate those list of merged rev numbers from branchA on branchC thus causing tree conflict. Svn will implicitly know about the rev numbers from branchA because branchA is a subset of branchC. Go here http://svnbook.red-bean.com/en/1.7/svn.branchmerge.advanced.html#svn.branchmerge.nomergedataand read Natural History and Implicit Mergeinfo. In this case, all you should have to do is: a) merge branchC UP to branchB b) merge --reintegrate branchB DOWN to branchC. Step a) will pick up any branchA changes (because all of branchA is a subset of branchC.) This strategy is still new to us. We're not sure what the intermediate steps are trying to accomplish, esp the merge up and down parts. What is the exact syntax (as an example) for (a) and (b) ? Sincerely If you did additional work on branchA *after* creating branchC, then you would need to: a) merge branchA UP to branchB, b) merge branchC UP to branchB, c) merge --reintegrate branchB down to branchC.
How to use --record-only to unblock
Hi All We plan to merge from the trunk to a feature branch using --record-only for a few revisions numbers. Is there a way to unblock a revision number after first using --record-only ? Thanks Sincerely
Re: How to use --record-only to unblock
On Wed, May 8, 2013 at 12:51 PM, Z W mpc8...@gmail.com wrote: Hi All We plan to merge from the trunk to a feature branch using --record-only for a few revisions numbers. Is there a way to unblock a revision number after first using --record-only ? Good question, I'm not sure really. Try (in a local working copy, no need to commit, but you can verify the results): cd $working-copy-of-featurebranch svn propget svn:mergeinfo . # Take note of what the mergeinfo looks like ... the revision that you want to unblock should be listed there (either individually, or as part of some range). Now: svn merge --record-only -c-$REV $SOURCE . svn propget svn:mergeinfo . # Take note of what the mergeinfo looks like ... the revision that you want to unblock should no longer be present in the mergeinfo. Note in the merge step above: '-c-$REV' means a negative revision number (minus the revision), which means that you want to (record-only) merge the reverse of $REV. Can you report back the results to the list? I'm curious whether this works. -- Johan
RE: mergeinfo between svn copied branches and merges
From: Z W [mailto:mpc8...@gmail.com] Sent: Wednesday, May 08, 2013 6:49 AM To: Andrew Reedick Cc: users@subversion.apache.org Subject: Re: mergeinfo between svn copied branches and merges In this case, all you should have to do is: a) merge branchC UP to branchB b) merge --reintegrate branchB DOWN to branchC. Step a) will pick up any branchA changes (because all of branchA is a subset of branchC.) This strategy is still new to us. We're not sure what the intermediate steps are trying to accomplish, esp the merge up and down parts. What is the exact syntax (as an example) for (a) and (b) ? a) merge branchC UP to branchB cd branchB_workspace (or create a brand new, clean workspace) svn status (check for existing changes) svn update (If your workspace is not up to date, svn merge will complain.) svn merge svn://.../branchC resolve any conflicts svn ci b) merge --reintegrate branchB DOWN to branchC. cd branchC_workspace (or checkout a clean workspace) svn status svn update Notify folks to not check into branchB, or simply lock branchB (since we will need to delete branchB) svn merge --reintegrate svn://.../branchB resolve any conflicts svn ci svn log -l 3 svn://.../branchB (Since we're going to delete branchB, make sure that no one checked into branchB after your merge) svn rm svn://.../branchB svn copy svn://.../branchC@1234 svn://.../branchB (recreate the branchB if it is still needed.) where 1234 is either the HEAD of branchC or the merge point on branchC. It's up to you. This is covered in the svn book: http://svnbook.red-bean.com/en/1.7/svn.branchmerge.basicmerging.html#svn.branchemerge.basicmerging.reintegrate UP/DOWN: You merge UP to a child branch that was created from a parent branch. You merge back DOWN to a parent branch from a child branch. UP and DOWN are just semantics to help you keep things straight due to the need to run --reintegrate. Once svn 1.8 comes out, you shouldn't have to worry about up, down, and --reintegrate anymore. we svn copy branchA to produce branchB In this case, branchA is the parent, and branchB is the child, so you merge UP from A to B, and DOWN (via --reintegrate) from B back to A. In the example given in the svn book, branchA would be the calc-trunk and branchB would be my-calc-branch. we then svn copy branchA to produce branchC Since branchC was created from branchA, branchC would still be the parent of branchB. Merge UP to branchB, merge DOWN to branchC. Of course, this is Subversion, and merge tracking wasn't part of the original design specs, so there's always the chance of something odd happening... Branching and merging: http://svnbook.red-bean.com/en/1.7/svn.branchmerge.html
svn issue
Hi, I found an issue in SVN. Suppose there are 10 project is in directory. And I want to update only 9 project. There is no option to lock one project not to update. By this issue I get problem. I will request you to solve this issue. Thanks Regards, Amit kumar | Senior Software Engineer | P +91 80 670 60718 | M +91 9740012743 | www.mindtree.comhttps://indiamail.mindtree.com/exchweb/bin/redir.asp?URL=http://www.mindtree.com/ MindTree Limited | West Campus, Global Village, RVCE Post, Mysore Road, Bangalore, India - 560 059 | Welcome to possible http://www.mindtree.com/email/disclaimer.html
Sub-Version Query
Hi, I have some queries on subversion - 1. What is the latest version avaiable of subversion? 2. What is the harrdware amp; software infrastructure required to install the subversion? 3. Is subversion a freeware or licensed sowtware? 4.I have to move some code base with all the versions of file nbsp;from CVS to subversion . Isnbsp;it doable? if yes how? Thanks in advance for your help. Regards, Anupamnbsp;
Re: svn issue
On Wed, May 8, 2013 at 2:25 AM, Amit Kumar [IN7537] amit_ku...@mindtree.com wrote: I found an issue in SVN. Suppose there are 10 project is in directory. And I want to update only 9 project. There is no option to lock one project not to update. By this issue I get problem. I will request you to solve this issue. Why is that a problem? You should be able to commit to any part you want unless access control blocks it. And normally you would only check out the project(s) that you are working on in the first place. Or are you talking about the revision numbers being global for the repository? That's just the way subversion works - and a feature. -- Les Mikesell lesmikes...@gmail.com
Re: Sub-Version Query
You answers are here: http://subversion.apache.org On May 8, 2013, at 3:30 AM, Anupam Choubey helloanu...@rediffmail.com wrote: Hi, I have some queries on subversion - 1. What is the latest version avaiable of subversion? 2. What is the harrdware software infrastructure required to install the subversion? 3. Is subversion a freeware or licensed sowtware? 4.I have to move some code base with all the versions of file from CVS to subversion . Is it doable? if yes how? Thanks in advance for your help. Regards, Anupam Get your own FREE website and domain with business email solutions, click here
RE: svn issue
You can do a fresh checkout and not include project10 in the initial update:
svn co -N svn://.../top_dir
cd top_dir
cd svn update project1 project2 ... project 9
Future 'svn update' commands in the top_dir directory will only update projects
1 through 9.
Or you can explicitly not update project 10:
Windows CMD shell:
for /f %i in (' svn ls ^| findstr /v project10') do @svn update %i
ksh/bash:
svn ls | grep -v project 10 | xargs svn update
Disclaimer: Top posting because Outlook has crushed my spirit.
From: Amit Kumar [IN7537] [mailto:amit_ku...@mindtree.com]
Sent: Wednesday, May 08, 2013 3:26 AM
To: users@subversion.apache.org
Cc: amitsinghra...@gmail.com
Subject: svn issue
Hi,
I found an issue in SVN. Suppose there are 10 project is in directory. And I
want to update only 9 project. There is no option to lock one project not to
update.
By this issue I get problem. I will request you to solve this issue.
Thanks Regards,
Amit kumar | Senior Software Engineer | P +91 80 670 60718 | M +91 9740012743 |
www.mindtree.comhttps://indiamail.mindtree.com/exchweb/bin/redir.asp?URL=http://www.mindtree.com/
MindTree Limited | West Campus, Global Village, RVCE Post, Mysore Road,
Bangalore, India - 560 059 | Welcome to possible
http://www.mindtree.com/email/disclaimer.html
How to remove revision number in mergeinfo eligible list
Hi All We use SVN 1.6 We have a revision number which refuses to move to the merged list after applying a merge. [root@host branchWC]# svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk r6554 [root@host branchWC]# svn merge -c 6554 --record-only https://some.url.com/svn/root/trunk [root@host branchWC]# svn propget svn:mergeinfo . It returns empty. How do we remove revision number in mergeinfo eligible list or force it to move to the merged list ? We cannot use regular merge for this rev number, unfortunately. Any help is appreciated. Sincerely
RE: How to remove revision number in mergeinfo eligible list
From: Z W [mailto:mpc8...@gmail.com] Sent: Wednesday, May 08, 2013 3:05 PM To: users@subversion.apache.org Subject: How to remove revision number in mergeinfo eligible list Hi All We use SVN 1.6 We have a revision number which refuses to move to the merged list after applying a merge. [root@host branchWC]# svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk r6554 [root@host branchWC]# svn merge -c 6554 --record-only https://some.url.com/svn/root/trunk [root@host branchWC]# svn propget svn:mergeinfo . It returns empty. How do we remove revision number in mergeinfo eligible list or force it to move to the merged list ? We cannot use regular merge for this rev number, unfortunately. Any help is appreciated. Sincerely That's odd. Compare the pre-merge svn:mergeinfo with the post-merge copy to see if anything was changed: svn propget svn:mergeinfo https://.../root/trunk a.txt svn propget svn:mergeinfo . b.txt diff a.txt b.txt If you run mergeinfo again (after the merge), does 6554 still show up in the list? svn mergeinfo ... | grep 6554 Do you see a trailing asterisk (*) for the branch in svn:mergeinfo? Ex: /branches/1.0:3166-3179* If so, then there might be some quirk in how svn is recording a partially merged range. Is it missing from all the svn:mergeinfo properties? (Run 'svn status' and run 'svn propget...' on the dirs with a 'M' in the second column.)
Re: How to remove revision number in mergeinfo eligible list
Hi Andrew Thanks for responding; appreciate it. We followed your instruction - svn propget svn:mergeinfo https://.../root/trunk a.txt svn propget svn:mergeinfo . b.txt diff a.txt b.txt a.txt returns an empty file b.txt returns empty too. The revision number 6554 change is about the creation of the trunk (https://.../root/trunk). In this trunk it has 2 directories A and B. In our working copy directory, it has directories A and B, too. We're trying to merge from the trunk to working copy branch svn mergeinfo ... | grep 6554 returns empty. On Wed, May 8, 2013 at 12:40 PM, Andrew Reedick andrew.reed...@cbeyond.netwrote: From: Z W [mailto:mpc8...@gmail.com] Sent: Wednesday, May 08, 2013 3:05 PM To: users@subversion.apache.org Subject: How to remove revision number in mergeinfo eligible list Hi All We use SVN 1.6 We have a revision number which refuses to move to the merged list after applying a merge. [root@host branchWC]# svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk r6554 [root@host branchWC]# svn merge -c 6554 --record-only https://some.url.com/svn/root/trunk [root@host branchWC]# svn propget svn:mergeinfo . It returns empty. How do we remove revision number in mergeinfo eligible list or force it to move to the merged list ? We cannot use regular merge for this rev number, unfortunately. Any help is appreciated. Sincerely That's odd. Compare the pre-merge svn:mergeinfo with the post-merge copy to see if anything was changed: svn propget svn:mergeinfo https://.../root/trunk a.txt svn propget svn:mergeinfo . b.txt diff a.txt b.txt If you run mergeinfo again (after the merge), does 6554 still show up in the list? svn mergeinfo ... | grep 6554 Do you see a trailing asterisk (*) for the branch in svn:mergeinfo? Ex: /branches/1.0:3166-3179* If so, then there might be some quirk in how svn is recording a partially merged range. Is it missing from all the svn:mergeinfo properties? (Run 'svn status' and run 'svn propget...' on the dirs with a 'M' in the second column.)
RE: How to remove revision number in mergeinfo eligible list
From: Z W [mailto:mpc8...@gmail.com] Sent: Wednesday, May 08, 2013 4:09 PM To: Andrew Reedick Cc: users@subversion.apache.org Subject: Re: How to remove revision number in mergeinfo eligible list Hi Andrew Thanks for responding; appreciate it. We followed your instruction - svn propget svn:mergeinfo https://.../root/trunk a.txt svn propget svn:mergeinfo . b.txt diff a.txt b.txt a.txt returns an empty file b.txt returns empty too. The revision number 6554 change is about the creation of the trunk (https://.../root/trunk). In this trunk it has 2 directories A and B. In our working copy directory, it has directories A and B, too. We're trying to merge from the trunk to working copy branch svn mergeinfo ... | grep 6554 returns empty. Okay... let's try this again. 1. checkout a clean workspace. 2. cd workspace 3. svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk pre-mergeinfo.txt 4. svn propget svn:mergeinfo . pre-prop.txt 5. svn merge -c 6554 --record-only https://some.url.com/svn/root/trunk 6. svn propget svn:mergeinfo . post-prop.txt 7. svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk post-mergeinfo.txt 8. diff pre-mergeinfo.txt post-mergeinfo.txt I expect r6554 to be in pre-mergeinfo.txt and not in post-mergeinfo.txt. 9. diff pre-prop.txt post-prop.txt If these files are different, then svn:mergeinfo was updated.
Re: How to remove revision number in mergeinfo eligible list
Hi Andrew Thanks for taking the time to respond. We did as told step by step and the result is the same - revision number is still in eligible list at the final step [root@host newbranchWC]# svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk r6554 r9946 [root@host newbranchWC]# svn propget svn:mergeinfo . /root/trunk:6560,9804,9806,9836,9874-9876,9880-9881,9899-9900,9951-9952 [root@host newbranchWC]# svn merge -c 6554 --record-only https://some.url.com/svn/root/trunk [root@host newbranchWC]# svn propget svn:mergeinfo . /root/trunk:6560,9804,9806,9836,9874-9876,9880-9881,9899-9900,9951-9952 [root@host newbranchWC]# svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk r6554 r9946 We wonder if it has to do with the rev number change itself. That 6554 rev number is about /root/Trunk creation from svn mkdir The following rev number 6560 is about renaming /root/Trunk to /root/trunk Then the following rev number 9804 is about svn copy of dir A to https://some.url.com/svn/root/trunk/A Then the following rev number 9806 is about svn copy of dir B to https://some.url.com/svn/root/trunk/B Would such actions impact the very first rev number for folder https://some.url.com/svn/root/Trunk ? We use SVN 1.6 Sincerely On Wed, May 8, 2013 at 2:34 PM, Andrew Reedick andrew.reed...@cbeyond.netwrote: From: Z W [mailto:mpc8...@gmail.com] Sent: Wednesday, May 08, 2013 4:09 PM To: Andrew Reedick Cc: users@subversion.apache.org Subject: Re: How to remove revision number in mergeinfo eligible list Hi Andrew Thanks for responding; appreciate it. We followed your instruction - svn propget svn:mergeinfo https://.../root/trunk a.txt svn propget svn:mergeinfo . b.txt diff a.txt b.txt a.txt returns an empty file b.txt returns empty too. The revision number 6554 change is about the creation of the trunk (https://.../root/trunk). In this trunk it has 2 directories A and B. In our working copy directory, it has directories A and B, too. We're trying to merge from the trunk to working copy branch svn mergeinfo ... | grep 6554 returns empty. Okay... let's try this again. 1. checkout a clean workspace. 2. cd workspace 3. svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk pre-mergeinfo.txt 4. svn propget svn:mergeinfo . pre-prop.txt 5. svn merge -c 6554 --record-only https://some.url.com/svn/root/trunk 6. svn propget svn:mergeinfo . post-prop.txt 7. svn mergeinfo --show-revs eligible https://some.url.com/svn/root/trunk post-mergeinfo.txt 8. diff pre-mergeinfo.txt post-mergeinfo.txt I expect r6554 to be in pre-mergeinfo.txt and not in post-mergeinfo.txt. 9. diff pre-prop.txt post-prop.txt If these files are different, then svn:mergeinfo was updated.
RE: svn issue
Hi les, Thanks for reply. But in my condition there are 77 items are in parent folder which is group of project and some other folder like image location, document location. All project folder is required except like documents and image folder. so I have to check out from parent folder only. Sometimes other team create new project. If I take full update then only all project will come in my local or all will update including new project. I want to lock some folder and then I want take full update and I want to update only project folder. Regards, Amit kumar -Original Message- From: Les Mikesell [mailto:lesmikes...@gmail.com] Sent: Wednesday, May 08, 2013 7:22 PM To: Amit Kumar [IN7537] Cc: users@subversion.apache.org; amitsinghra...@gmail.com Subject: Re: svn issue On Wed, May 8, 2013 at 2:25 AM, Amit Kumar [IN7537] amit_ku...@mindtree.com wrote: I found an issue in SVN. Suppose there are 10 project is in directory. And I want to update only 9 project. There is no option to lock one project not to update. By this issue I get problem. I will request you to solve this issue. Why is that a problem? You should be able to commit to any part you want unless access control blocks it. And normally you would only check out the project(s) that you are working on in the first place. Or are you talking about the revision numbers being global for the repository? That's just the way subversion works - and a feature. -- Les Mikesell lesmikes...@gmail.com http://www.mindtree.com/email/disclaimer.html
