Home > Computers > programming > bzr > BzrMerge | About

1. Commit changes on both branches (child and parent, or source and branch)

2. To retrive changes from the parent branch, use merge like this in the child :

root@messagerie-test[10.10.10.26]~/SCRIPTS/MAIL # bzr merge
Merging from remembered parent location bzr+ssh://10.10.10.19:22022/root/SCRIPTS/MAIL/
+N  disablemailbox.sql                                                                                                             
+N  newuser.single
+N  removeuser.single
+N  setupbackupmailbox.single
 M  createmailbox.single
 M  createmailbox.sql.single
 M  mailboxes
 M  searchmailbox.sql
 M  setupbackupmailbox.courier.single
All changes applied successfully.                                                                                                  
root@messagerie-test[10.10.10.26]~/SCRIPTS/MAIL # 

3. Now commit :

root@messagerie-test[10.10.10.26]~/SCRIPTS/MAIL # bzr st
added:
  disablemailbox.sql
  newuser.single
  removeuser.single
  setupbackupmailbox.single
modified:
  createmailbox.single
  createmailbox.sql.single
  mailboxes
  searchmailbox.sql
  setupbackupmailbox.courier.single
unknown:
  sentfiltertemplate.tpl
pending merge tips: (use -v to see all merge revisions)
  root 2015-07-19 added:
root@messagerie-test[10.10.10.26]~/SCRIPTS/MAIL # bzr ci
Committing to: /root/SCRIPTS/MAIL/                                                                                                 
modified createmailbox.single
modified createmailbox.sql.single
added disablemailbox.sql
modified mailboxes
added newuser.single
added removeuser.single
modified searchmailbox.sql
modified setupbackupmailbox.courier.single
added setupbackupmailbox.single
Committed revision 10.                                                                                                             
root@messagerie-test[10.10.10.26]~/SCRIPTS/MAIL # 

4. push

root@messagerie-test[10.10.10.26]~/SCRIPTS/MAIL # bzr push
Using saved push location: bzr+ssh://10.10.10.19:22022/root/SCRIPTS/MAIL/
This transport does not update the working tree of: bzr+ssh://10.10.10.19:22022/root/SCRIPTS/MAIL/. See 'bzr help working-trees' for more information.
Pushed up to revision 10.
root@messagerie-test[10.10.10.26]~/SCRIPTS/MAIL # 

5. And update the parent branch

root@messagerie-secours[10.10.10.19] ~/SCRIPTS/MAIL # bzr update
 M  README.SCRIPTS                                                                     
R   addcctobackup.all => installmailfilter.all
RM  addcctobackup.single => installmailfilter.single
All changes applied successfully.                                                      
Updated to revision 10 of branch /root/SCRIPTS/MAIL
root@messagerie-secours[10.10.10.19] ~/SCRIPTS/MAIL # 

The child branch received all missing parts from the parent branch, merged it with its own modificiations, and pushed the results back to the parent. The parent update its working tree.

All branches now synchronized.


contact : @ychaouche yacinechaouche at yahoocom


QR Code
QR Code bzrmerge (generated for current page)