Bazaar

push to parent branch as a single revision

Asked by seb7

Hi,

* I created a branch from scratch, + made 1 commit. (/dev/main)
* Create de child branch (/dev/tests/)
* made a few commits in that child branch
* Now I'd like to update the main branch with the changes made in child branch BUT i'd like the main branch to have only one new revision (not the x commit i made in the child branch).
How can i achevied this ?

Ok, i think that's the tash of 'merge' (not sure) ...
cd /dev/main/
bzr merge ../tests/

Question information

Language:
English Edit question
Status:
Solved
For:
Bazaar Edit question
Assignee:
No assignee Edit question
Solved by:
seb7
Solved:
Last query:
Last reply:
Revision history for this message
seb7 (seb7) said : 		#1

Ok, i think that's the tash of 'merge' (not sure) ...
cd /dev/main/
bzr merge ../tests