Stack Overflow
Stack Overflow

Questions tagged [mergeinfo]

39 questions
0
votes
1 answer

Removing a mergeinfo revision number

I have the following revisions in the mergeinfo between two of my branches. sh% svn mergeinfo --show-revs merged '^/trunk' '^/branches/myotherbranch' r139784 r139796 r139883 r139944 r139953 r139994 r140005 And I want to remove one of the revisions…
borncrusader
  • 263
  • 3
  • 8
0
votes
1 answer

How past svn merge info of a file is used during svn merging

Production release branch(Branch PR ) has tags from 1 to tag 20 . Here ,Tag 20 is final prod tag Branch A : created from current Production tag say: tag number 1 . Branch B : created from Branch A + its own changes Now tag 2 to tag 20 are merged…
Kaku
  • 119
  • 2
  • 11
0
votes
2 answers

how svn merge behaves during merging from branch to branch with different code base

We have different branches in SVN and do svn merge between branches. Each branch is nearly related to each other as our code is incremental. Suppose if there are around 5 branches (Branch 1 ,Branch2 ,etc .... ) at a time and branch X is merged into…
Kaku
  • 119
  • 2
  • 11
0
votes
1 answer

Update mergeinfo data after bad merge

Have a question for all SVN gurus here! I have a feature branch, based of trunk. I did a merge to sync work done in trunk in the branch and committed all changes except mergeinfo prop on branch root. So now, when i try to do another sync merge, it…
Gonçalo Marrafa
  • 2,013
  • 4
  • 27
  • 34
0
votes
1 answer

Obsolete entries in svn:mergeinfo

I have obsolete entries in my svn:mergeinfo from are already deleted branches. Is there a way to clean the entries in svn:mergeinfo?
Martin Fernau
  • 787
  • 1
  • 6
  • 19
0
votes
0 answers

svn merging of a subtree, then the full tree

In my company we use SVN to merge subtrees of the trunk into the branches and vice versa. For example, we merge /Trunk/folderA/ --> /Branch/folderA/ and not always perform the root merge from /Trunk/ --> /Branch/. I noticed that the mergeinfo of…
Ohn
  • 51
  • 4
0
votes
1 answer

SVN log details of uncommitted merge

I had recently merged my branch with the latest revision of the trunk. However, I did not commit at that time and do not remember with which trunk version I had merged. Currently, I need the trunk revision information during the merge. Is it…
SKPS
  • 5,433
  • 5
  • 29
  • 63
0
votes
1 answer

SVN : how to get information about revisions

I use the 'svn mergeinfo' command to fetch information about the changes that should be merged from branch to trunk. This command returns only the list of revisions, for example: r18427 r18428 r18429 ... I would like to fetch also the comments that…
Rarar
  • 419
  • 2
  • 6
  • 19
-1
votes
1 answer

SVN Quick Merge

I'm looking to script a very common yet neglected till the last minute action, SVN merge. Ideally it should run for the current user and for lets say the last 2 days' commits under your name. So in a scenario where you've worked on a branch,…
Henno van Rensburg
  • 55
  • 4
1 2
3