# # patch "tests/t_automate_inventory.at" # from [6cf9eb1dcaaf03298b0ed13251790db8f1a6d85b] # to [8f3c6871ca801c7af928ad92d9300ee9076a1768] # ======================================================================== --- tests/t_automate_inventory.at 6cf9eb1dcaaf03298b0ed13251790db8f1a6d85b +++ tests/t_automate_inventory.at 8f3c6871ca801c7af928ad92d9300ee9076a1768 @@ -62,8 +62,8 @@ AT_CHECK(MONOTONE rename temporary original, [], [ignore], [ignore]) AT_CHECK(MONOTONE automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) -AT_CHECK(grep '^RRP 2 1 original$' stdout, [], [ignore], [ignore]) -AT_CHECK(grep '^RRP 1 2 unchanged$' stdout, [], [ignore], [ignore]) +AT_CHECK(grep '^RRP 1 2 original$' stdout, [], [ignore], [ignore]) +AT_CHECK(grep '^RRP 2 1 unchanged$' stdout, [], [ignore], [ignore]) # swapped and moved @@ -72,8 +72,8 @@ AT_CHECK(mv temporary original) AT_CHECK(MONOTONE automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) -AT_CHECK(grep '^RR 2 1 original$' stdout, [], [ignore], [ignore]) -AT_CHECK(grep '^RR 1 2 unchanged$' stdout, [], [ignore], [ignore]) +AT_CHECK(grep '^RR 1 2 original$' stdout, [], [ignore], [ignore]) +AT_CHECK(grep '^RR 2 1 unchanged$' stdout, [], [ignore], [ignore]) # rename foo bar; add foo @@ -98,9 +98,9 @@ AT_CHECK(MONOTONE rename temporary dropped, [], [ignore], [ignore]) AT_CHECK(MONOTONE automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) -AT_CHECK(grep '^RRP 1 3 original$' stdout, [], [ignore], [ignore]) -AT_CHECK(grep '^RRP 2 1 dropped$' stdout, [], [ignore], [ignore]) -AT_CHECK(grep '^RRP 3 2 missing$' stdout, [], [ignore], [ignore]) +AT_CHECK(grep '^RRP 1 3 dropped$' stdout, [], [ignore], [ignore]) +AT_CHECK(grep '^RRP 2 1 missing$' stdout, [], [ignore], [ignore]) +AT_CHECK(grep '^RRP 3 2 original$' stdout, [], [ignore], [ignore]) # rotated and moved @@ -110,9 +110,9 @@ AT_CHECK(mv temporary dropped) AT_CHECK(MONOTONE automate inventory --rcfile=inventory_hooks.lua, [], [stdout], [ignore]) -AT_CHECK(grep '^RR 1 3 original$' stdout, [], [ignore], [ignore]) -AT_CHECK(grep '^RR 2 1 dropped$' stdout, [], [ignore], [ignore]) -AT_CHECK(grep '^RR 3 2 missing$' stdout, [], [ignore], [ignore]) +AT_CHECK(grep '^RR 1 3 dropped$' stdout, [], [ignore], [ignore]) +AT_CHECK(grep '^RR 2 1 missing$' stdout, [], [ignore], [ignore]) +AT_CHECK(grep '^RR 3 2 original$' stdout, [], [ignore], [ignore]) # dropped but not removed and thus unknown