#openttdcoop

planetmaker@localhost hg-test branch5-r60 (tip) ~/hg-test $ hg branches
branch5                       60:b617ee61aaf4
default                       37:3a1e58edd9d6
branch1                       39:8ba3f8c93261 (inaktiv)
planetmaker@localhost hg-test branch5-r60 (tip) ~/hg-test $ hg up branch5
0 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst
planetmaker@localhost hg-test branch5-r60 (tip) ~/hg-test $ ls
abc  bar  blah  diff.diff  dir1  dir2  eee  eef  eeg  foo  foo22
planetmaker@localhost hg-test branch5-r60 (tip) ~/hg-test $ echo blah > customer
planetmaker@localhost hg-test branch5-r60 (tip) ~/hg-test $ hg add customer
planetmaker@localhost hg-test branch5-r60 (tip) ~/hg-test $ hg st
M abc
M eee
M eef
M eeg
A customer
planetmaker@localhost hg-test branch5-r60 (tip) ~/hg-test $ hg ci -m "Add customer" customer
planetmaker@localhost hg-test branch5-r61 (tip) ~/hg-test $ hg ci -m "Add some other stuff"
planetmaker@localhost hg-test branch5-r62 (tip) ~/hg-test $ hg up default
1 Dateien aktualisiert, 0 Dateien zusammengeführt, 7 Dateien entfernt, 0 Dateien ungelöst
planetmaker@localhost hg-test default-r37 ~/hg-test $ hg merge branch5
8 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst
(Zusammenführen von Zweigen, vergiss nicht 'hg commit' auszuführen)
planetmaker@localhost hg-test default-r37 ~/hg-test $ hg st
M .hgtags
M abc
M customer
M dir1/f1
M dir2/f2
M eee
M eef
M eeg
planetmaker@localhost hg-test default-r37 ~/hg-test $ hg forget customer
planetmaker@localhost hg-test default-r37 ~/hg-test $ hg st
M .hgtags
M abc
M dir1/f1
M dir2/f2
M eee
M eef
M eeg
R customer
planetmaker@localhost hg-test default-r37 ~/hg-test $ hg ci -m "Merge with branch5"
planetmaker@localhost hg-test default-r63 (tip) ~/hg-test $ hg glog -l5
@    default-63:834286e2c2f4 tip 2016-07-19 12:38 +0200 (planetmaker)
|\      Merge with branch5
| |
o |  branch5-62:84f3665e87da 2016-07-19 12:38 +0200 (planetmaker)
| |     Add some other stuff
| |
o |  branch5-61:bd2bb4ee36c5 2016-07-19 12:37 +0200 (planetmaker)
| |     Add customer
| |
o |  branch5-60:b617ee61aaf4 2016-05-18 16:40 +0200 (planetmaker)
| |     Add some files
| |
o |  branch5-59:606950897283 2016-04-07 13:42 +0200 (planetmaker)
| |     Backed out changeset a2475f86f207
| |
planetmaker@localhost hg-test default-r63 (tip) ~/hg-test $ echo blah >> 
abc        bar        blah       customer   diff.diff  dir1/      dir2/      eee        eef        eeg        foo        foo22      .hg/       .hgtags    
planetmaker@localhost hg-test default-r63 (tip) ~/hg-test $ echo blah >> blah
planetmaker@localhost hg-test default-r63 (tip) ~/hg-test $ hg ci -m "More blah in blah"
hplanetmaker@localhost hg-test default-r64 (tip) ~/hg-test $ hg up branch5
2 Dateien aktualisiert, 0 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst
planetmaker@localhost hg-test branch5-r62 ~/hg-test $ hg st
planetmaker@localhost hg-test branch5-r62 ~/hg-test $ echo bla bla >> customer
planetmaker@localhost hg-test branch5-r62 ~/hg-test $ hg ci -m "More customer stuff"
planetmaker@localhost hg-test branch5-r65 (tip) ~/hg-test $ hg up default
1 Dateien aktualisiert, 0 Dateien zusammengeführt, 1 Dateien entfernt, 0 Dateien ungelöst
planetmaker@localhost hg-test default-r64 ~/hg-test $ hg glog -l5
o  branch5-65:2a24bda48baf tip 2016-07-19 12:39 +0200 (planetmaker)
|       More customer stuff
|
| @  default-64:e3faeba870a4 2016-07-19 12:39 +0200 (planetmaker)
| |     More blah in blah
| |
| o  default-63:834286e2c2f4 2016-07-19 12:38 +0200 (planetmaker)
|/|     Merge with branch5
| |
o |  branch5-62:84f3665e87da 2016-07-19 12:38 +0200 (planetmaker)
| |     Add some other stuff
| |
o |  branch5-61:bd2bb4ee36c5 2016-07-19 12:37 +0200 (planetmaker)
| |     Add customer
| |
planetmaker@localhost hg-test default-r64 ~/hg-test $ hg merge branch5
remote changed customer which local deleted
use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d
0 Dateien aktualisiert, 1 Dateien zusammengeführt, 0 Dateien entfernt, 0 Dateien ungelöst
(Zusammenführen von Zweigen, vergiss nicht 'hg commit' auszuführen)
planetmaker@localhost hg-test default-r64 ~/hg-test $ hg st
planetmaker@localhost hg-test default-r64 ~/hg-test $ hg ci -m "New merge"
planetmaker@localhost hg-test default-r66 (tip) ~/hg-test $ hg glog -l5
@    default-66:d750c468b0ba tip 2016-07-19 12:41 +0200 (planetmaker)
|\      New merge
| |
| o  branch5-65:2a24bda48baf 2016-07-19 12:39 +0200 (planetmaker)
| |     More customer stuff
| |
o |  default-64:e3faeba870a4 2016-07-19 12:39 +0200 (planetmaker)
| |     More blah in blah
| |
o |  default-63:834286e2c2f4 2016-07-19 12:38 +0200 (planetmaker)
|\|     Merge with branch5
| |
| o  branch5-62:84f3665e87da 2016-07-19 12:38 +0200 (planetmaker)
| |     Add some other stuff
| |

Mark as private