All geek questions in one place

Can I merge a merge without specifying the first revision?

The most crucial question I've ever written in SO:

myproject / tags / production always contains a ready-made version of myproject. I merge consecutive approved changes from the chest in it in the same way, where N is the current rev rev and M is the new desired rev:

cd tags / products
svn merge -r N: M ^ / trunk
svn ci -m 'connects the trunk via rxxxx for production

My question is: why do I always need to specify N? If I just use "-r M", I get "svn: second revision required." But N always matches my previous M, and I thought the merge tracking point (we are running svn 1.6) was so that svn remembered the versions that you already merged ..?

+3
source share
2 answers

I have not tried this myself, but according to the subversion documentation, the command mergeis smart enough to include only previously un merged changes .

But if you do not want to include all versions of the chests, you can try:

svn merge -r 0:M ^/trunk

He must merge the changes that have not yet been merged into your working copy to version M .

+4
source

Subversion , , . , , "-r M" M, . .

Subversion , .

0

Source: https://habr.com/ru/post/1786023/

More articles:


All Articles