problem with merging branch to trunk?

tags:

tortoisesvn

views:

answers:

problem with merging branch to trunk?

Hello all,

Just now I tried to merge my branch to the trunk with the following handlings:

Update the working copy of the trunk
Merge->reintegrate

Then the folder of the working copy of the trunk gets the conflicting sign. By means of Check for modifications I get a list which contains a lot files and even the folder of the trunk copy. Beside the list a window with the title "svn_mergeinfo-TortoiseMerge" appears. This window displays two panels, svn:mergeinfo:Working Base and svn:mergeinfo: Working Copy. In the Working Copy panel there is a file with some numbers, perhaps versions, aheaded with a plus sign. Its counterpart in the Working Base panel is gray blank. Most of them have been found not modified at all.

What are the wrongings I have done? How could I get rid of the issue?

Thanks a lot in advance.

John

The svn:mergeinfo property is set so Subversion can help you track which revisions have been merged into the trunk or a particular branch. This is normal, and harmless, as it does not affect file contents. For instance, TortoiseSVN uses this to gray out revisions that have already been merged in the GUI for convenience.

Check out this link for more information => svn:mergeinfo

MattGWagner 2010-06-28 13:36:59

could I commit my reintegrated working copy of trunk without caring about these supposedly modified folder and files?

John 2010-06-28 13:49:35

You can commit the re-integrated working copy. You may wish to commit the svn:mergeinfo property at least on the top-level folder (e.g. trunk/) but it should not be set on any other file/folder.

MattGWagner 2010-06-28 13:55:08

Thanks a lot for the info. How could I disable such a kind of property commit?

John 2010-06-28 14:39:08

Check this question out => http://stackoverflow.com/questions/767418/remove-unnecessary-svnmergeinfo-properties

MattGWagner 2010-06-28 15:37:04

Thanks again. Justnow I read thru the recommended posting. There are still two questions on my side.Is it harmful to remove the svn:mergeinfo in property?Why some of the files containing such properties, but the other not?

John 2010-06-29 07:36:42

In my limited experience, it hasn't been harmful to remove the property if it got accidentally added to any folder/file below the checkout level. Probably a good idea to check out the svn book..

MattGWagner 2010-06-29 15:07:22

Seems that changes in trunk and branch can not be merged automatically. (Did somebody or you modify trunk after branch has been made?) Suppose, you need to merge it manually, with the help of mdiff tool for example.

Pmod 2010-06-28 13:37:23

Thanks for your reply. Update had been carried first before my reintegation.Do you mean, I have to commit the changes in my trunk copy manually?

John 2010-06-28 13:44:00

I think you need to merge changes from branch to trunk manually. Actually, even in case there are obvious and little changes in branch or tag, I've never used automatic merging. I use merging tool with GUI and this gives more ways to control over the results.

Pmod 2010-06-28 14:07:13

Anyway, this may be helpful: http://tortoisesvn.net/docs/release/TortoiseSVN_en/tsvn-dug-merge.html

Pmod 2010-06-28 20:12:24

ansaurus

tags:

views:

answers:

problem with merging branch to trunk?

related questions