diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-03-26 15:15:25 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-03-26 15:15:25 +0100 |
| commit | ca7900299dc32c7b59e896f5f4b9a38978f226a0 (patch) | |
| tree | d1f15db7c51c83c1eb1fa11565adc2a295c48eec /tests | |
| parent | 7d7d597afd0a562916f106d259f4ff78383f9631 (diff) | |
| parent | 9e18d7cc163ab95524349567fc8c4205cd0f11ce (diff) | |
| download | morph-ca7900299dc32c7b59e896f5f4b9a38978f226a0.tar.gz | |
Add rudimentary branch+merge support
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/missing-ref.stderr | 2 | ||||
| -rwxr-xr-x | tests/show-dependencies.script | 4 | ||||
| -rw-r--r-- | tests/show-dependencies.stdout | 244 |
3 files changed, 125 insertions, 125 deletions
diff --git a/tests/missing-ref.stderr b/tests/missing-ref.stderr index 5a1ffb2a..748a891c 100644 --- a/tests/missing-ref.stderr +++ b/tests/missing-ref.stderr @@ -1 +1 @@ -ERROR: non-existent-branch is an invalid reference for repo chunk-repo +ERROR: non-existent-branch is an invalid reference for repo file:///chunk-repo diff --git a/tests/show-dependencies.script b/tests/show-dependencies.script index 78fb186b..4b28078f 100755 --- a/tests/show-dependencies.script +++ b/tests/show-dependencies.script @@ -20,5 +20,5 @@ set -eu -tests/morph show-dependencies test-repo master xfce-core.morph - +tests/morph show-dependencies test-repo master xfce-core.morph | \ + sed "s,$DATADIR,TMP,g" diff --git a/tests/show-dependencies.stdout b/tests/show-dependencies.stdout index 5ad63c65..94ae5749 100644 --- a/tests/show-dependencies.stdout +++ b/tests/show-dependencies.stdout @@ -1,133 +1,133 @@ dependency tree: - test-repo|refs/remotes/origin/master|cairo.morph - test-repo|refs/remotes/origin/master|dbus-glib.morph - -> test-repo|refs/remotes/origin/master|dbus.morph - -> test-repo|refs/remotes/origin/master|glib.morph - test-repo|refs/remotes/origin/master|dbus.morph - test-repo|refs/remotes/origin/master|exo.morph - -> test-repo|refs/remotes/origin/master|gtk-stack.morph - -> test-repo|refs/remotes/origin/master|libxfce4util.morph - test-repo|refs/remotes/origin/master|fontconfig.morph - test-repo|refs/remotes/origin/master|freetype.morph - test-repo|refs/remotes/origin/master|garcon.morph - -> test-repo|refs/remotes/origin/master|gtk-stack.morph - -> test-repo|refs/remotes/origin/master|libxfce4util.morph - test-repo|refs/remotes/origin/master|gdk-pixbuf.morph - -> test-repo|refs/remotes/origin/master|glib.morph - test-repo|refs/remotes/origin/master|glib.morph - test-repo|refs/remotes/origin/master|gtk-stack.morph - -> test-repo|refs/remotes/origin/master|cairo.morph - -> test-repo|refs/remotes/origin/master|dbus-glib.morph - -> test-repo|refs/remotes/origin/master|dbus.morph - -> test-repo|refs/remotes/origin/master|fontconfig.morph - -> test-repo|refs/remotes/origin/master|freetype.morph - -> test-repo|refs/remotes/origin/master|gdk-pixbuf.morph - -> test-repo|refs/remotes/origin/master|glib.morph - -> test-repo|refs/remotes/origin/master|gtk.morph - -> test-repo|refs/remotes/origin/master|pango.morph - test-repo|refs/remotes/origin/master|gtk-xfce-engine.morph - -> test-repo|refs/remotes/origin/master|garcon.morph - -> test-repo|refs/remotes/origin/master|gtk-stack.morph - -> test-repo|refs/remotes/origin/master|libxfce4ui.morph - -> test-repo|refs/remotes/origin/master|xfconf.morph - test-repo|refs/remotes/origin/master|gtk.morph - -> test-repo|refs/remotes/origin/master|cairo.morph - -> test-repo|refs/remotes/origin/master|gdk-pixbuf.morph - -> test-repo|refs/remotes/origin/master|glib.morph - -> test-repo|refs/remotes/origin/master|pango.morph - test-repo|refs/remotes/origin/master|libxfce4ui.morph - -> test-repo|refs/remotes/origin/master|gtk-stack.morph - -> test-repo|refs/remotes/origin/master|xfconf.morph - test-repo|refs/remotes/origin/master|libxfce4util.morph - -> test-repo|refs/remotes/origin/master|gtk-stack.morph - test-repo|refs/remotes/origin/master|pango.morph - -> test-repo|refs/remotes/origin/master|fontconfig.morph - -> test-repo|refs/remotes/origin/master|freetype.morph - test-repo|refs/remotes/origin/master|thunar.morph - -> test-repo|refs/remotes/origin/master|exo.morph - -> test-repo|refs/remotes/origin/master|gtk-stack.morph - -> test-repo|refs/remotes/origin/master|libxfce4ui.morph - test-repo|refs/remotes/origin/master|tumbler.morph - -> test-repo|refs/remotes/origin/master|gtk-stack.morph - test-repo|refs/remotes/origin/master|xfce-core.morph - -> test-repo|refs/remotes/origin/master|exo.morph - -> test-repo|refs/remotes/origin/master|garcon.morph - -> test-repo|refs/remotes/origin/master|gtk-stack.morph - -> test-repo|refs/remotes/origin/master|gtk-xfce-engine.morph - -> test-repo|refs/remotes/origin/master|libxfce4ui.morph - -> test-repo|refs/remotes/origin/master|libxfce4util.morph - -> test-repo|refs/remotes/origin/master|thunar.morph - -> test-repo|refs/remotes/origin/master|tumbler.morph - -> test-repo|refs/remotes/origin/master|xfce4-appfinder.morph - -> test-repo|refs/remotes/origin/master|xfce4-panel.morph - -> test-repo|refs/remotes/origin/master|xfce4-session.morph - -> test-repo|refs/remotes/origin/master|xfce4-settings.morph - -> test-repo|refs/remotes/origin/master|xfconf.morph - -> test-repo|refs/remotes/origin/master|xfdesktop.morph - -> test-repo|refs/remotes/origin/master|xfwm4.morph - test-repo|refs/remotes/origin/master|xfce4-appfinder.morph - -> test-repo|refs/remotes/origin/master|garcon.morph - -> test-repo|refs/remotes/origin/master|gtk-stack.morph - -> test-repo|refs/remotes/origin/master|libxfce4ui.morph - -> test-repo|refs/remotes/origin/master|xfconf.morph - test-repo|refs/remotes/origin/master|xfce4-panel.morph - -> test-repo|refs/remotes/origin/master|exo.morph - -> test-repo|refs/remotes/origin/master|garcon.morph - -> test-repo|refs/remotes/origin/master|gtk-stack.morph - -> test-repo|refs/remotes/origin/master|libxfce4ui.morph - test-repo|refs/remotes/origin/master|xfce4-session.morph - -> test-repo|refs/remotes/origin/master|exo.morph - -> test-repo|refs/remotes/origin/master|gtk-stack.morph - -> test-repo|refs/remotes/origin/master|libxfce4ui.morph - -> test-repo|refs/remotes/origin/master|xfconf.morph - test-repo|refs/remotes/origin/master|xfce4-settings.morph - -> test-repo|refs/remotes/origin/master|exo.morph - -> test-repo|refs/remotes/origin/master|gtk-stack.morph - -> test-repo|refs/remotes/origin/master|libxfce4ui.morph - -> test-repo|refs/remotes/origin/master|xfconf.morph - test-repo|refs/remotes/origin/master|xfconf.morph - -> test-repo|refs/remotes/origin/master|gtk-stack.morph - -> test-repo|refs/remotes/origin/master|libxfce4util.morph - test-repo|refs/remotes/origin/master|xfdesktop.morph - -> test-repo|refs/remotes/origin/master|gtk-stack.morph - -> test-repo|refs/remotes/origin/master|libxfce4ui.morph - -> test-repo|refs/remotes/origin/master|xfconf.morph - test-repo|refs/remotes/origin/master|xfwm4.morph - -> test-repo|refs/remotes/origin/master|gtk-stack.morph - -> test-repo|refs/remotes/origin/master|libxfce4ui.morph - -> test-repo|refs/remotes/origin/master|xfconf.morph + file://TMP/test-repo|refs/remotes/origin/master|cairo.morph + file://TMP/test-repo|refs/remotes/origin/master|dbus-glib.morph + -> file://TMP/test-repo|refs/remotes/origin/master|dbus.morph + -> file://TMP/test-repo|refs/remotes/origin/master|glib.morph + file://TMP/test-repo|refs/remotes/origin/master|dbus.morph + file://TMP/test-repo|refs/remotes/origin/master|exo.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph + -> file://TMP/test-repo|refs/remotes/origin/master|libxfce4util.morph + file://TMP/test-repo|refs/remotes/origin/master|fontconfig.morph + file://TMP/test-repo|refs/remotes/origin/master|freetype.morph + file://TMP/test-repo|refs/remotes/origin/master|garcon.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph + -> file://TMP/test-repo|refs/remotes/origin/master|libxfce4util.morph + file://TMP/test-repo|refs/remotes/origin/master|gdk-pixbuf.morph + -> file://TMP/test-repo|refs/remotes/origin/master|glib.morph + file://TMP/test-repo|refs/remotes/origin/master|glib.morph + file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph + -> file://TMP/test-repo|refs/remotes/origin/master|cairo.morph + -> file://TMP/test-repo|refs/remotes/origin/master|dbus-glib.morph + -> file://TMP/test-repo|refs/remotes/origin/master|dbus.morph + -> file://TMP/test-repo|refs/remotes/origin/master|fontconfig.morph + -> file://TMP/test-repo|refs/remotes/origin/master|freetype.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gdk-pixbuf.morph + -> file://TMP/test-repo|refs/remotes/origin/master|glib.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk.morph + -> file://TMP/test-repo|refs/remotes/origin/master|pango.morph + file://TMP/test-repo|refs/remotes/origin/master|gtk-xfce-engine.morph + -> file://TMP/test-repo|refs/remotes/origin/master|garcon.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph + -> file://TMP/test-repo|refs/remotes/origin/master|libxfce4ui.morph + -> file://TMP/test-repo|refs/remotes/origin/master|xfconf.morph + file://TMP/test-repo|refs/remotes/origin/master|gtk.morph + -> file://TMP/test-repo|refs/remotes/origin/master|cairo.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gdk-pixbuf.morph + -> file://TMP/test-repo|refs/remotes/origin/master|glib.morph + -> file://TMP/test-repo|refs/remotes/origin/master|pango.morph + file://TMP/test-repo|refs/remotes/origin/master|libxfce4ui.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph + -> file://TMP/test-repo|refs/remotes/origin/master|xfconf.morph + file://TMP/test-repo|refs/remotes/origin/master|libxfce4util.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph + file://TMP/test-repo|refs/remotes/origin/master|pango.morph + -> file://TMP/test-repo|refs/remotes/origin/master|fontconfig.morph + -> file://TMP/test-repo|refs/remotes/origin/master|freetype.morph + file://TMP/test-repo|refs/remotes/origin/master|thunar.morph + -> file://TMP/test-repo|refs/remotes/origin/master|exo.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph + -> file://TMP/test-repo|refs/remotes/origin/master|libxfce4ui.morph + file://TMP/test-repo|refs/remotes/origin/master|tumbler.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph + file://TMP/test-repo|refs/remotes/origin/master|xfce-core.morph + -> file://TMP/test-repo|refs/remotes/origin/master|exo.morph + -> file://TMP/test-repo|refs/remotes/origin/master|garcon.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk-xfce-engine.morph + -> file://TMP/test-repo|refs/remotes/origin/master|libxfce4ui.morph + -> file://TMP/test-repo|refs/remotes/origin/master|libxfce4util.morph + -> file://TMP/test-repo|refs/remotes/origin/master|thunar.morph + -> file://TMP/test-repo|refs/remotes/origin/master|tumbler.morph + -> file://TMP/test-repo|refs/remotes/origin/master|xfce4-appfinder.morph + -> file://TMP/test-repo|refs/remotes/origin/master|xfce4-panel.morph + -> file://TMP/test-repo|refs/remotes/origin/master|xfce4-session.morph + -> file://TMP/test-repo|refs/remotes/origin/master|xfce4-settings.morph + -> file://TMP/test-repo|refs/remotes/origin/master|xfconf.morph + -> file://TMP/test-repo|refs/remotes/origin/master|xfdesktop.morph + -> file://TMP/test-repo|refs/remotes/origin/master|xfwm4.morph + file://TMP/test-repo|refs/remotes/origin/master|xfce4-appfinder.morph + -> file://TMP/test-repo|refs/remotes/origin/master|garcon.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph + -> file://TMP/test-repo|refs/remotes/origin/master|libxfce4ui.morph + -> file://TMP/test-repo|refs/remotes/origin/master|xfconf.morph + file://TMP/test-repo|refs/remotes/origin/master|xfce4-panel.morph + -> file://TMP/test-repo|refs/remotes/origin/master|exo.morph + -> file://TMP/test-repo|refs/remotes/origin/master|garcon.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph + -> file://TMP/test-repo|refs/remotes/origin/master|libxfce4ui.morph + file://TMP/test-repo|refs/remotes/origin/master|xfce4-session.morph + -> file://TMP/test-repo|refs/remotes/origin/master|exo.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph + -> file://TMP/test-repo|refs/remotes/origin/master|libxfce4ui.morph + -> file://TMP/test-repo|refs/remotes/origin/master|xfconf.morph + file://TMP/test-repo|refs/remotes/origin/master|xfce4-settings.morph + -> file://TMP/test-repo|refs/remotes/origin/master|exo.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph + -> file://TMP/test-repo|refs/remotes/origin/master|libxfce4ui.morph + -> file://TMP/test-repo|refs/remotes/origin/master|xfconf.morph + file://TMP/test-repo|refs/remotes/origin/master|xfconf.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph + -> file://TMP/test-repo|refs/remotes/origin/master|libxfce4util.morph + file://TMP/test-repo|refs/remotes/origin/master|xfdesktop.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph + -> file://TMP/test-repo|refs/remotes/origin/master|libxfce4ui.morph + -> file://TMP/test-repo|refs/remotes/origin/master|xfconf.morph + file://TMP/test-repo|refs/remotes/origin/master|xfwm4.morph + -> file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph + -> file://TMP/test-repo|refs/remotes/origin/master|libxfce4ui.morph + -> file://TMP/test-repo|refs/remotes/origin/master|xfconf.morph build order: group: - test-repo|refs/remotes/origin/master|cairo.morph - test-repo|refs/remotes/origin/master|dbus.morph - test-repo|refs/remotes/origin/master|fontconfig.morph - test-repo|refs/remotes/origin/master|freetype.morph - test-repo|refs/remotes/origin/master|glib.morph + file://TMP/test-repo|refs/remotes/origin/master|cairo.morph + file://TMP/test-repo|refs/remotes/origin/master|dbus.morph + file://TMP/test-repo|refs/remotes/origin/master|fontconfig.morph + file://TMP/test-repo|refs/remotes/origin/master|freetype.morph + file://TMP/test-repo|refs/remotes/origin/master|glib.morph group: - test-repo|refs/remotes/origin/master|dbus-glib.morph - test-repo|refs/remotes/origin/master|gdk-pixbuf.morph - test-repo|refs/remotes/origin/master|pango.morph + file://TMP/test-repo|refs/remotes/origin/master|dbus-glib.morph + file://TMP/test-repo|refs/remotes/origin/master|gdk-pixbuf.morph + file://TMP/test-repo|refs/remotes/origin/master|pango.morph group: - test-repo|refs/remotes/origin/master|gtk.morph + file://TMP/test-repo|refs/remotes/origin/master|gtk.morph group: - test-repo|refs/remotes/origin/master|gtk-stack.morph + file://TMP/test-repo|refs/remotes/origin/master|gtk-stack.morph group: - test-repo|refs/remotes/origin/master|libxfce4util.morph - test-repo|refs/remotes/origin/master|tumbler.morph + file://TMP/test-repo|refs/remotes/origin/master|libxfce4util.morph + file://TMP/test-repo|refs/remotes/origin/master|tumbler.morph group: - test-repo|refs/remotes/origin/master|exo.morph - test-repo|refs/remotes/origin/master|garcon.morph - test-repo|refs/remotes/origin/master|xfconf.morph + file://TMP/test-repo|refs/remotes/origin/master|exo.morph + file://TMP/test-repo|refs/remotes/origin/master|garcon.morph + file://TMP/test-repo|refs/remotes/origin/master|xfconf.morph group: - test-repo|refs/remotes/origin/master|libxfce4ui.morph + file://TMP/test-repo|refs/remotes/origin/master|libxfce4ui.morph group: - test-repo|refs/remotes/origin/master|gtk-xfce-engine.morph - test-repo|refs/remotes/origin/master|thunar.morph - test-repo|refs/remotes/origin/master|xfce4-appfinder.morph - test-repo|refs/remotes/origin/master|xfce4-panel.morph - test-repo|refs/remotes/origin/master|xfce4-session.morph - test-repo|refs/remotes/origin/master|xfce4-settings.morph - test-repo|refs/remotes/origin/master|xfdesktop.morph - test-repo|refs/remotes/origin/master|xfwm4.morph + file://TMP/test-repo|refs/remotes/origin/master|gtk-xfce-engine.morph + file://TMP/test-repo|refs/remotes/origin/master|thunar.morph + file://TMP/test-repo|refs/remotes/origin/master|xfce4-appfinder.morph + file://TMP/test-repo|refs/remotes/origin/master|xfce4-panel.morph + file://TMP/test-repo|refs/remotes/origin/master|xfce4-session.morph + file://TMP/test-repo|refs/remotes/origin/master|xfce4-settings.morph + file://TMP/test-repo|refs/remotes/origin/master|xfdesktop.morph + file://TMP/test-repo|refs/remotes/origin/master|xfwm4.morph group: - test-repo|refs/remotes/origin/master|xfce-core.morph + file://TMP/test-repo|refs/remotes/origin/master|xfce-core.morph |