equal
deleted
inserted
replaced
925 | () public |
925 | () public |
926 o 17:f3794e5a91dc added l to l |
926 o 17:f3794e5a91dc added l to l |
927 | () public |
927 | () public |
928 ~ |
928 ~ |
929 |
929 |
930 When the public changesets is splitted causing phase-divergence |
930 When the public changesets is split causing phase-divergence |
931 --------------------------------------------------------------- |
931 ------------------------------------------------------------ |
932 |
932 |
933 $ cd ../split |
933 $ cd ../split |
934 |
934 |
935 $ echo m > m |
935 $ echo m > m |
936 $ echo n > n |
936 $ echo n > n |
1038 --- a/n Thu Jan 01 00:00:00 1970 +0000 |
1038 --- a/n Thu Jan 01 00:00:00 1970 +0000 |
1039 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1039 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
1040 @@ -1,1 +0,0 @@ |
1040 @@ -1,1 +0,0 @@ |
1041 -n |
1041 -n |
1042 |
1042 |
1043 When the public changeset is splitted across various branches |
1043 When the public changeset is split across various branches |
1044 -------------------------------------------------------------- |
1044 ---------------------------------------------------------- |
1045 |
1045 |
1046 $ cd ../split-across-branches |
1046 $ cd ../split-across-branches |
1047 |
1047 |
1048 $ echo p > p |
1048 $ echo p > p |
1049 $ echo q > q |
1049 $ echo q > q |