# # # patch "tests/defecting_attributes/__driver__.lua" # from [84e58f80b9db320305a9be30cfd4578d79ce279a] # to [23a95f7b5c56347e26787c3b2e77835467e87f0d] # ============================================================ --- tests/defecting_attributes/__driver__.lua 84e58f80b9db320305a9be30cfd4578d79ce279a +++ tests/defecting_attributes/__driver__.lua 23a95f7b5c56347e26787c3b2e77835467e87f0d @@ -1,28 +1,26 @@ commit() mtn_setup() -- create the parent revision addfile("foo", "blabla") commit() -parent=base_revision() +parent = base_revision() - -- do an unrelated change addfile("bla", "blabla") commit() -R1=base_revision() +child = base_revision() -- create some divergence -check(mtn("update", "-r", parent), 0, false, false) +revert_to(parent) check(mtn("attr", "set", "foo", "name", "value"), 0, false, false) commit() -R2=base_revision() -- ensure that there are no changes in the current workspace check(mtn("status"), 0, true, false) check(qgrep("no changes", "stdout")) --- update to R1 -check(mtn("update", "-r", R1), 0, false, false) +-- update to child +check(mtn("update", "-r", child), 0, false, false) check(mtn("status"), 0, true, false) xfail(qgrep("no changes", "stdout"))