mergeinfo Questions

1

I think I must be missing something fundamental in my understanding which is preventing me from getting my head around this. In what situations would you want to use the --ignore-ancestry option w...
Whipcord asked 27/9, 2016 at 20:26

2

I would like to use a pre-commit hook that prevents developers from setting svn:mergeinfo on non-root directories. That is, I want to enforce that svn:mergeinfo can only be set on directories like ...
Amathist asked 22/7, 2010 at 4:0

4

Solved

I am trying to keep a feature branch up to date by merging trunk into the branch. Problem is, that about 2000 files that was there when the branch was created, and that has been left untouched on b...
Blush asked 24/9, 2010 at 9:26

3

Solved

I am working with a Subversion server that was recently upgraded to version 1.7. I am using the command-line Linux client 1.7.10. I created a branch like this: %: svn copy svn+ssh://acme.com/a/b/...
Pinup asked 18/7, 2013 at 10:5

3

Solved

I've long heard about svn's merge-conflict troubles. I was relieved, thought, when I learnt that svn a couple of releases ago implemented a feature called mergeinfo. It almost seemed as if its in...
Dune asked 20/2, 2014 at 19:11

2

Solved

I've a "problem" with svn I can't understand why sometimes when I merge two branches it reports modify on mergeinfo property on files with no changes on the text. Is it a normal behavior? If not, w...
Childs asked 11/9, 2012 at 13:6

1

Solved

What is the correct workflow for merging svn tracked branches using git-svn. I've read a little about the git-svn svn.pushmergeinfo config key, and the caveats are: From http://www.kernel.org/pub/...
Pentamerous asked 19/6, 2012 at 17:31

1

Solved

In recent versions of git, the configuration svn.pushmergeinfo was introduced: config key: svn.pushmergeinfo This option will cause git-svn to attempt to automatically populate the svn:mergei...
Luzluzader asked 14/3, 2012 at 11:24

4

Solved

We try to keep the 'svn:mergeinfo' property on the root branch folder only. However, we keep seeing it creep into subfolders. We've been able to identify some possible causes: Moving a folder in ...
Napalm asked 31/12, 2009 at 8:57

1

I have the Subversion 1.6.5 client and 1.5.4 server. And I mostly only care about diffs on fully repository paths, not working copies. When diffing branches, ones that have been merged alrea...
Meissner asked 3/5, 2010 at 2:30
1

© 2022 - 2024 — McMap. All rights reserved.