| View previous topic :: View next topic |
| Author |
Message |
gigiskhan
Joined: 27 Jun 2008 Posts: 2 Location: Reunion Island
|
Posted: Fri Jun 27, 2008 6:13 am Post subject: Retrieval of mergeinfo unsupported |
|
|
Hi dears,
I am using SVN 1.4.4
and tortoise 1.5.0.
I want to merge a branch to the trunk, i select merge reintegrate a branch, but tortoise tells me:
| Code: | Error: Retrieval of mergeinfo unsupported by 'https://gigi/usvn/svn/MMstandard'
|
I checked around and saw that it seems that this functionnality is available since SVN 1.5.0.
Does anyone knows how to merge a branch in the trunk with previous version of svn?
regards |
|
| Back to top |
|
JNiven
Joined: 17 Feb 2008 Posts: 1250 Location: Glasgow, Scotland
|
Posted: Fri Jun 27, 2008 6:34 am Post subject: |
|
|
Hi gigiskhan
You could use a 1.4 client.
Cheers
John _________________ John Niven |
|
| Back to top |
|
andyl
Joined: 03 Nov 2005 Posts: 4242
|
Posted: Fri Jun 27, 2008 8:10 am Post subject: |
|
|
| Merge tracking (which you're using in this example) requires a 1.5 or later server. |
|
| Back to top |
|
gigiskhan
Joined: 27 Jun 2008 Posts: 2 Location: Reunion Island
|
Posted: Fri Jun 27, 2008 9:45 am Post subject: |
|
|
thank you for your help. I installed tortoise 1.4.4, and of course, it works better, even if I can not find merge tracking option.
But Could someone explain me where to find information about this new feature. What is the difference between merging a branch in the trunk the old way and using merge tracking. Would this second one merge the braanch and delete it from the repository?
And also how to say that my post is solved? |
|
| Back to top |
|
JNiven
Joined: 17 Feb 2008 Posts: 1250 Location: Glasgow, Scotland
|
Posted: Fri Jun 27, 2008 6:02 pm Post subject: |
|
|
Hi gigiskhan
Merge tracking is new with SVN 1.5 - two good places to start for information are the SVN website, and in particular the release notes for 1.5 (http://subversion.tigris.org/svn_1.5_releasenotes.html#merge-tracking) and the CollabNet website (http://merge-tracking.open.collab.net/).
With earlier versions of SVN you'd need to remember which revisions you had already merged, and avoid merging them again. With 1.5 you can simply "repeat" a merge, and the revisions that have already been merged will be skipped.
I don't know how to mark the thread as resolved - are you able to edit the original post's subject?
Cheers
John _________________ John Niven |
|
| Back to top |
|
|
View previous topic :: View next topic |