[meld] Add test file for bzr repo setup
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Add test file for bzr repo setup
- Date: Fri, 27 Sep 2013 22:11:01 +0000 (UTC)
commit c3c3827607b2d62d42807bbfbcf7131348ed60b3
Author: louis <louis obsidian com au>
Date: Wed Aug 28 12:03:07 2013 +1000
Add test file for bzr repo setup
meld/test/testbzr.sh | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 0 deletions(-)
---
diff --git a/meld/test/testbzr.sh b/meld/test/testbzr.sh
new file mode 100755
index 0000000..dbe62e3
--- /dev/null
+++ b/meld/test/testbzr.sh
@@ -0,0 +1,71 @@
+#!/bin/sh
+rm -R bzrtest*
+
+mkdir bzrtest1
+cd bzrtest1
+bzr init
+echo "normal" > normal.txt
+echo "renamed" > renamed.txt
+echo "modified" > modified.txt
+echo "deleted" > deleted.txt
+echo "exec" > exec.txt
+echo "conflict" > conflict.txt
+
+mkdir normal-dir
+mkdir renamed-dir
+echo "subfile" > ./renamed-dir/subfile
+mkdir modified-dir
+mkdir deleted-dir
+mkdir exec-dir
+
+bzr add *
+bzr commit -m "Initial commit"
+
+
+# CHDIR and do a merge
+cd ..
+bzr branch bzrtest1 bzrtest2
+
+# Make a change back in the original branch so we get a conflict
+cd bzrtest1
+echo "parent change" >> conflict.txt
+bzr commit -m "Parent change"
+
+# CD back to the new branch and make a change
+cd ../bzrtest2
+echo "child change" >> conflict.txt
+bzr commit -m "Child change"
+bzr merge
+
+
+# Add new file
+# Add new directory
+echo "new" > new.txt
+mkdir new-dir
+echo "new-dir-file" > ./new-dir/new-dir-file.txt
+bzr add ./new.txt
+bzr add ./new-dir
+
+# Delete a file
+# delete a directory
+bzr rm deleted.txt
+# Meld doesn't track this unless there's files below it....
+bzr rm deleted-dir
+
+# Rename a file
+# Rename a directory
+bzr mv renamed.txt renamed-new.txt
+# bzr shows the directory as renamed, but not any subfiles. (different to git)
+# Meld will not show the directory rename unless there are subfiles.
+bzr mv renamed-dir renamed-new-dir
+
+# Modify a file
+echo "modified" >> modified.txt
+# Modify a directory.... how?
+
+# Change executable bit on file
+# Change executable bit on a directory
+chmod +x ./exec.txt
+# Can't check this... if we -x on owner bzr can't status it anyway.
+chmod g-x ./exec-dir
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]