tests/test-xdg.t
author Martin von Zweigbergk <martinvonz@google.com>
Fri, 14 Jul 2017 14:30:55 -0700
changeset 33678 855a1856466d
parent 32429 7d8da7b54dc0
child 51607 a4b3b8dee0a8
permissions -rw-r--r--
tests: demonstrate crash when trying to rebase merge without its parents As the test case shows, when "hg rebase -d G -r 'B + D + F'" is run on the following graph, we crash with traceback. It's reasonable to fail because we can not easily produce a correct rebased F. The problem is what diff to apply to either the rebased B or the rebased D. We could potentially produce the result by e.g. applying the (F-D) diff to the rebased B and then applying the reverse (E-D) diff on top, but that could result in merge conflicts in each of those steps, which we don't have a way of dealing with. So for now, let's just add a test case to demonstrate that we crash (i.e. the AssertionError is clearly incorrect since the user can run into it). F /| C E | | B D G \|/ A Differential Revision: https://phab.mercurial-scm.org/D212
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
30941
354020079723 hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     1
#if no-windows no-osx
354020079723 hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     2
354020079723 hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     3
  $ mkdir -p xdgconf/hg
354020079723 hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     4
  $ echo '[ui]' > xdgconf/hg/hgrc
354020079723 hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     5
  $ echo 'username = foobar' >> xdgconf/hg/hgrc
354020079723 hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     6
  $ XDG_CONFIG_HOME="`pwd`/xdgconf" ; export XDG_CONFIG_HOME
354020079723 hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     7
  $ unset HGRCPATH
32429
7d8da7b54dc0 tests: hide warning from test-xdg.t
Durham Goode <durham@fb.com>
parents: 30941
diff changeset
     8
  $ hg config ui.username 2>/dev/null
30941
354020079723 hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
     9
  foobar
354020079723 hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    10
354020079723 hg: allow usage of XDG_CONFIG_HOME/hg/hgrc
David Demelier <demelier.david@gmail.com>
parents:
diff changeset
    11
#endif