Veracity Q&A home login about faq

I've finished a bunch of work in my feature branch. I merged the latest changes from master in (via vv merge -b master); the tests passed; all's committed. So feature now contains the latest/greatest code, and I'd like that revision to become the new master head.

I tried to merge back (vv merge -b feature from the master working folder), but vv complained that one revision was an ancestor of the other.

asked Jul 14 '11 at 20:37

Paul%20Roub's gravatar image

Paul Roub ♦♦
2.4k81853

1

This has caught me and other developers off guard as well. Maybe the merge error message could be improved?

(Feb 16 '12 at 14:21) Jace Browning

You're on the right track. You're in a situation something like:

branch: feature
head: 552:...
parents: 551, 545

branch: master
head: 545
parents: ...

and you're aiming for:

branch: master
head: 552

And you're right, vv won't let you merge between ancestors. In this case, vv branch is your tool of choice. Specifically:

vv branch move-head master --rev 552

will do the trick. To fully clean up, you'll want to

vv branch close feature

if you don't plan on working in that branch any more.

And you'll certainly want to visit the master working folder and

vv update
link

answered Jul 14 '11 at 20:43

Paul%20Roub's gravatar image

Paul Roub ♦♦
2.4k81853

Your answer
toggle preview

Follow this question

By Email:

Once you sign in you will be able to subscribe for any updates here

By RSS:

Answers

Answers and Comments

Markdown Basics

  • *italic* or __italic__
  • **bold** or __bold__
  • link:[text](http://url.com/ "title")
  • image?![alt text](/path/img.jpg "title")
  • numbered list: 1. Foo 2. Bar
  • to add a line break simply add two spaces to where you would like the new line to be.
  • basic HTML tags are also supported

Tags:

×22
×17

Asked: Jul 14 '11 at 20:37

Seen: 1,650 times

Last updated: Feb 16 '12 at 14:21

powered by OSQA