|
|
|
@ -77,14 +77,17 @@ Non-interactive merge:
|
|
|
|
|
* version 2 records
|
|
|
|
|
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
|
|
|
|
|
other: 10f9a0a634e82080907e62f075ab119cbc565ea6
|
|
|
|
|
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
|
|
local path: file1 (flags "")
|
|
|
|
|
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
|
|
|
|
|
other path: file1 (node null)
|
|
|
|
|
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file2 (record type "C", state "u", hash null)
|
|
|
|
|
local path: file2 (flags "")
|
|
|
|
|
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
|
|
|
|
|
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
|
|
|
|
|
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
|
|
|
|
|
local path: file3 (flags "")
|
|
|
|
|
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
|
|
|
|
@ -136,14 +139,17 @@ Interactive merge:
|
|
|
|
|
* version 2 records
|
|
|
|
|
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
|
|
|
|
|
other: 10f9a0a634e82080907e62f075ab119cbc565ea6
|
|
|
|
|
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
|
|
local path: file1 (flags "")
|
|
|
|
|
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
|
|
|
|
|
other path: file1 (node null)
|
|
|
|
|
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file2 (record type "C", state "r", hash null)
|
|
|
|
|
local path: file2 (flags "")
|
|
|
|
|
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
|
|
|
|
|
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
|
|
|
|
|
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
|
|
|
|
|
local path: file3 (flags "")
|
|
|
|
|
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
|
|
|
|
@ -205,14 +211,17 @@ Interactive merge with bad input:
|
|
|
|
|
* version 2 records
|
|
|
|
|
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
|
|
|
|
|
other: 10f9a0a634e82080907e62f075ab119cbc565ea6
|
|
|
|
|
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
|
|
local path: file1 (flags "")
|
|
|
|
|
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
|
|
|
|
|
other path: file1 (node null)
|
|
|
|
|
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file2 (record type "C", state "r", hash null)
|
|
|
|
|
local path: file2 (flags "")
|
|
|
|
|
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
|
|
|
|
|
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
|
|
|
|
|
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
|
|
|
|
|
local path: file3 (flags "")
|
|
|
|
|
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
|
|
|
|
@ -261,14 +270,17 @@ Interactive merge with not enough input:
|
|
|
|
|
* version 2 records
|
|
|
|
|
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
|
|
|
|
|
other: 10f9a0a634e82080907e62f075ab119cbc565ea6
|
|
|
|
|
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
|
|
local path: file1 (flags "")
|
|
|
|
|
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
|
|
|
|
|
other path: file1 (node null)
|
|
|
|
|
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file2 (record type "C", state "u", hash null)
|
|
|
|
|
local path: file2 (flags "")
|
|
|
|
|
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
|
|
|
|
|
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
|
|
|
|
|
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
|
|
|
|
|
local path: file3 (flags "")
|
|
|
|
|
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
|
|
|
|
@ -306,14 +318,17 @@ Choose local versions of files
|
|
|
|
|
* version 2 records
|
|
|
|
|
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
|
|
|
|
|
other: 10f9a0a634e82080907e62f075ab119cbc565ea6
|
|
|
|
|
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
|
|
local path: file1 (flags "")
|
|
|
|
|
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
|
|
|
|
|
other path: file1 (node null)
|
|
|
|
|
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file2 (record type "C", state "r", hash null)
|
|
|
|
|
local path: file2 (flags "")
|
|
|
|
|
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
|
|
|
|
|
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
|
|
|
|
|
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file3 (record type "F", state "r", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
|
|
|
|
|
local path: file3 (flags "")
|
|
|
|
|
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
|
|
|
|
@ -347,14 +362,17 @@ Choose other versions of files
|
|
|
|
|
* version 2 records
|
|
|
|
|
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
|
|
|
|
|
other: 10f9a0a634e82080907e62f075ab119cbc565ea6
|
|
|
|
|
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
|
|
local path: file1 (flags "")
|
|
|
|
|
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
|
|
|
|
|
other path: file1 (node null)
|
|
|
|
|
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file2 (record type "C", state "r", hash null)
|
|
|
|
|
local path: file2 (flags "")
|
|
|
|
|
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
|
|
|
|
|
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
|
|
|
|
|
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file3 (record type "F", state "r", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
|
|
|
|
|
local path: file3 (flags "")
|
|
|
|
|
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
|
|
|
|
@ -389,14 +407,17 @@ Fail
|
|
|
|
|
* version 2 records
|
|
|
|
|
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
|
|
|
|
|
other: 10f9a0a634e82080907e62f075ab119cbc565ea6
|
|
|
|
|
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
|
|
local path: file1 (flags "")
|
|
|
|
|
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
|
|
|
|
|
other path: file1 (node null)
|
|
|
|
|
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file2 (record type "C", state "u", hash null)
|
|
|
|
|
local path: file2 (flags "")
|
|
|
|
|
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
|
|
|
|
|
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
|
|
|
|
|
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
|
|
|
|
|
local path: file3 (flags "")
|
|
|
|
|
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
|
|
|
|
@ -439,14 +460,17 @@ Force prompts with no input (should be similar to :fail)
|
|
|
|
|
* version 2 records
|
|
|
|
|
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
|
|
|
|
|
other: 10f9a0a634e82080907e62f075ab119cbc565ea6
|
|
|
|
|
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
|
|
local path: file1 (flags "")
|
|
|
|
|
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
|
|
|
|
|
other path: file1 (node null)
|
|
|
|
|
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file2 (record type "C", state "u", hash null)
|
|
|
|
|
local path: file2 (flags "")
|
|
|
|
|
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
|
|
|
|
|
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
|
|
|
|
|
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
|
|
|
|
|
local path: file3 (flags "")
|
|
|
|
|
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
|
|
|
|
@ -491,14 +515,17 @@ Force prompts
|
|
|
|
|
* version 2 records
|
|
|
|
|
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
|
|
|
|
|
other: 10f9a0a634e82080907e62f075ab119cbc565ea6
|
|
|
|
|
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
|
|
local path: file1 (flags "")
|
|
|
|
|
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
|
|
|
|
|
other path: file1 (node null)
|
|
|
|
|
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file2 (record type "C", state "u", hash null)
|
|
|
|
|
local path: file2 (flags "")
|
|
|
|
|
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
|
|
|
|
|
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
|
|
|
|
|
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
|
|
|
|
|
local path: file3 (flags "")
|
|
|
|
|
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
|
|
|
|
@ -541,14 +568,17 @@ Choose to merge all files
|
|
|
|
|
* version 2 records
|
|
|
|
|
local: 13910f48cf7bdb2a0ba6e24b4900e4fdd5739dd4
|
|
|
|
|
other: 10f9a0a634e82080907e62f075ab119cbc565ea6
|
|
|
|
|
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
|
|
local path: file1 (flags "")
|
|
|
|
|
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
|
|
|
|
|
other path: file1 (node null)
|
|
|
|
|
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file2 (record type "C", state "u", hash null)
|
|
|
|
|
local path: file2 (flags "")
|
|
|
|
|
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
|
|
|
|
|
other path: file2 (node e7c1328648519852e723de86c0c0525acd779257)
|
|
|
|
|
file extras: file3 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file3 (record type "F", state "u", hash d5b0a58bc47161b1b8a831084b366f757c4f0b11)
|
|
|
|
|
local path: file3 (flags "")
|
|
|
|
|
ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4)
|
|
|
|
@ -697,10 +727,12 @@ Non-interactive linear update
|
|
|
|
|
* version 2 records
|
|
|
|
|
local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
|
|
|
|
|
other: 10f9a0a634e82080907e62f075ab119cbc565ea6
|
|
|
|
|
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
|
|
local path: file1 (flags "")
|
|
|
|
|
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
|
|
|
|
|
other path: file1 (node null)
|
|
|
|
|
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file2 (record type "C", state "u", hash null)
|
|
|
|
|
local path: file2 (flags "")
|
|
|
|
|
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
|
|
|
|
@ -735,10 +767,12 @@ Choose local versions of files
|
|
|
|
|
* version 2 records
|
|
|
|
|
local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
|
|
|
|
|
other: 10f9a0a634e82080907e62f075ab119cbc565ea6
|
|
|
|
|
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
|
|
local path: file1 (flags "")
|
|
|
|
|
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
|
|
|
|
|
other path: file1 (node null)
|
|
|
|
|
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file2 (record type "C", state "r", hash null)
|
|
|
|
|
local path: file2 (flags "")
|
|
|
|
|
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
|
|
|
|
@ -771,10 +805,12 @@ Choose other versions of files
|
|
|
|
|
* version 2 records
|
|
|
|
|
local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
|
|
|
|
|
other: 10f9a0a634e82080907e62f075ab119cbc565ea6
|
|
|
|
|
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file1 (record type "C", state "r", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
|
|
local path: file1 (flags "")
|
|
|
|
|
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
|
|
|
|
|
other path: file1 (node null)
|
|
|
|
|
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file2 (record type "C", state "r", hash null)
|
|
|
|
|
local path: file2 (flags "")
|
|
|
|
|
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
|
|
|
|
@ -809,10 +845,12 @@ Fail
|
|
|
|
|
* version 2 records
|
|
|
|
|
local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
|
|
|
|
|
other: 10f9a0a634e82080907e62f075ab119cbc565ea6
|
|
|
|
|
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
|
|
local path: file1 (flags "")
|
|
|
|
|
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
|
|
|
|
|
other path: file1 (node null)
|
|
|
|
|
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file2 (record type "C", state "u", hash null)
|
|
|
|
|
local path: file2 (flags "")
|
|
|
|
|
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
|
|
|
|
@ -853,10 +891,12 @@ Force prompts with no input
|
|
|
|
|
* version 2 records
|
|
|
|
|
local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
|
|
|
|
|
other: 10f9a0a634e82080907e62f075ab119cbc565ea6
|
|
|
|
|
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
|
|
local path: file1 (flags "")
|
|
|
|
|
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
|
|
|
|
|
other path: file1 (node null)
|
|
|
|
|
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file2 (record type "C", state "u", hash null)
|
|
|
|
|
local path: file2 (flags "")
|
|
|
|
|
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
|
|
|
|
@ -898,10 +938,12 @@ Choose to merge all files
|
|
|
|
|
* version 2 records
|
|
|
|
|
local: ab57bf49aa276a22d35a473592d4c34b5abc3eff
|
|
|
|
|
other: 10f9a0a634e82080907e62f075ab119cbc565ea6
|
|
|
|
|
file extras: file1 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file1 (record type "C", state "u", hash 60b27f004e454aca81b0480209cce5081ec52390)
|
|
|
|
|
local path: file1 (flags "")
|
|
|
|
|
ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be)
|
|
|
|
|
other path: file1 (node null)
|
|
|
|
|
file extras: file2 (ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff)
|
|
|
|
|
file: file2 (record type "C", state "u", hash null)
|
|
|
|
|
local path: file2 (flags "")
|
|
|
|
|
ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e)
|
|
|
|
|