Ok, with that I have a different test failure on the pu branch --
please tell me if I'm spamming the list or if there's some other
protocol I should be using to report issues on pu.
$ ./t4213-log-remerge-diff.sh -v
Initialized empty Git repository in
/Users/michael.blume/workspace/git/t/trash
directory.t4213-log-remerge-diff/.git/
expecting success:
test_commit A file original &&
test_commit B file change &&
git checkout -b side A &&
test_commit C file side &&
git checkout -b delete A &&
git rm file &&
test_commit D &&
git checkout -b benign master &&
test_must_fail git merge C &&
test_commit M1 file merged &&
git checkout -b evil B &&
test_must_fail git merge C &&
test_commit M2 file change &&
git checkout -b dm C &&
test_must_fail git merge D &&
test_commit M3 file resolved &&
git checkout -b unrelated A &&
test_commit unrelated_file &&
git merge C &&
test_tick &&
git tag M4 &&
git checkout -b dir A &&
mkdir sub &&
test_commit dir sub/file &&
git checkout -b file A &&
test_commit file sub &&
git checkout -b dirfile tags/dir &&
test_must_fail git merge tags/file &&
git rm --cached sub &&
test_commit M5 sub/file resolved &&
git checkout -b filedir tags/file &&
test_must_fail git merge tags/dir &&
git rm --cached sub/file &&
rm -rf sub &&
test_commit M6 sub resolved &&
git branch -D master side delete dir file
[master (root-commit) aca07f6] A
Author: A U Thor <author@xxxxxxxxxxx>
1 file changed, 1 insertion(+)
create mode 100644 file
[master a3cd1bc] B
Author: A U Thor <author@xxxxxxxxxxx>
1 file changed, 1 insertion(+), 1 deletion(-)
Switched to a new branch 'side'
[side 61d2ae1] C
Author: A U Thor <author@xxxxxxxxxxx>
1 file changed, 1 insertion(+), 1 deletion(-)
Switched to a new branch 'delete'
rm 'file'
[delete 63d1471] D
Author: A U Thor <author@xxxxxxxxxxx>
2 files changed, 1 insertion(+), 1 deletion(-)
create mode 100644 D.t
delete mode 100644 file
Switched to a new branch 'benign'
Merging:
a3cd1bc B
virtual C
found 1 common ancestor:
aca07f6 A
Auto-merging file
CONFLICT (content): Merge conflict in file
Automatic merge failed; fix conflicts and then commit the result.
[benign 19968bc] M1
Author: A U Thor <author@xxxxxxxxxxx>
Switched to a new branch 'evil'
Merging:
a3cd1bc B
virtual C
found 1 common ancestor:
aca07f6 A
Auto-merging file
CONFLICT (content): Merge conflict in file
Automatic merge failed; fix conflicts and then commit the result.
[evil 93e9c1d] M2
Author: A U Thor <author@xxxxxxxxxxx>
Switched to a new branch 'dm'
Merging:
61d2ae1 C
virtual D
found 1 common ancestor:
aca07f6 A
CONFLICT (modify/delete): file deleted in D and modified in HEAD.
Version HEAD of file left in tree.
Automatic merge failed; fix conflicts and then commit the result.
[dm 35c618f] M3
Author: A U Thor <author@xxxxxxxxxxx>
Switched to a new branch 'unrelated'
[unrelated c19dbae] unrelated_file
Author: A U Thor <author@xxxxxxxxxxx>
1 file changed, 1 insertion(+)
create mode 100644 unrelated_file.t
Merging:
c19dbae unrelated_file
virtual C
found 1 common ancestor:
aca07f6 A
Merge made by the 'recursive' strategy.
file | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Switched to a new branch 'dir'
[dir 8ac24b8] dir
Author: A U Thor <author@xxxxxxxxxxx>
1 file changed, 1 insertion(+)
create mode 100644 sub/file
Switched to a new branch 'file'
[file 36416b6] file
Author: A U Thor <author@xxxxxxxxxxx>
1 file changed, 1 insertion(+)
create mode 100644 sub
Switched to a new branch 'dirfile'
Merging:
8ac24b8 dir
virtual tags/file
found 1 common ancestor:
aca07f6 A
Adding sub/file
CONFLICT (directory/file): There is a directory with name sub in HEAD.
Adding sub as sub~tags_file
Automatic merge failed; fix conflicts and then commit the result.
sub: needs merge
rm 'sub'
[dirfile f0a64c3] M5
Author: A U Thor <author@xxxxxxxxxxx>
Switched to a new branch 'filedir'
Merging:
36416b6 file
virtual tags/dir
found 1 common ancestor:
aca07f6 A
Adding sub/file
Removing sub to make room for subdirectory
CONFLICT (file/directory): There is a directory with name sub in
tags/dir. Adding sub as sub~HEAD
Automatic merge failed; fix conflicts and then commit the result.
rm 'sub/file'
[filedir 7182a02] M6
Author: A U Thor <author@xxxxxxxxxxx>
Deleted branch master (was a3cd1bc).
Deleted branch side (was 61d2ae1).
Deleted branch delete (was 63d1471).
Deleted branch dir (was 8ac24b8).
Deleted branch file (was 36416b6).
ok 1 - setup
expecting success:
git log -p --cc unrelated >expected &&
git log -p --remerge-diff unrelated >actual &&
test_cmp expected actual
ok 2 - unrelated merge: without conflicts
expecting success:
git log -1 -p --remerge-diff benign >output &&
clean_output <output >actual &&
test_cmp expected actual
--- expected 2014-11-10 02:43:34.000000000 +0000
+++ actual 2014-11-10 02:43:34.000000000 +0000
@@ -1,12 +1,12 @@
commit benign
-Merge:
+Merge: a3cd1bc 61d2ae1
Author: A U Thor <author@xxxxxxxxxxx>
-Date:
+Date: Thu Apr 7 15:17:13 2005 -0700
M1
diff --git a/file b/file
-index
+index cc073fb..20b117f 100644
--- a/file
+++ b/file
@@ -1,5 +1 @@
not ok 3 - benign merge: conflicts resolved
#
# git log -1 -p --remerge-diff benign >output &&
# clean_output <output >actual &&
# test_cmp expected actual
#
expecting success:
git log -1 --remerge-diff -p evil >output &&
clean_output <output >actual &&
test_cmp expected actual
--- expected 2014-11-10 02:43:34.000000000 +0000
+++ actual 2014-11-10 02:43:34.000000000 +0000
@@ -1,12 +1,12 @@
commit evil
-Merge:
+Merge: a3cd1bc 61d2ae1
Author: A U Thor <author@xxxxxxxxxxx>
-Date:
+Date: Thu Apr 7 15:18:13 2005 -0700
M2
diff --git a/file b/file
-index
+index cc073fb..0835e4f 100644
--- a/file
+++ b/file
@@ -1,5 +1 @@
not ok 4 - evil merge: changes ignored
#
# git log -1 --remerge-diff -p evil >output &&
# clean_output <output >actual &&
# test_cmp expected actual
#
expecting success:
git log -1 --remerge-diff -p dm >output &&
clean_output <output >actual &&
test_cmp expected actual
--- expected 2014-11-10 02:43:34.000000000 +0000
+++ actual 2014-11-10 02:43:34.000000000 +0000
@@ -1,12 +1,12 @@
commit dm
-Merge:
+Merge: 61d2ae1 63d1471
Author: A U Thor <author@xxxxxxxxxxx>
-Date:
+Date: Thu Apr 7 15:19:13 2005 -0700
M3
diff --git a/file b/file
-index
+index dd79d22..2ab19ae 100644
--- a/file
+++ b/file
@@ -1,4 +1 @@
not ok 5 - delete/modify conflict
#
# git log -1 --remerge-diff -p dm >output &&
# clean_output <output >actual &&
# test_cmp expected actual
#
expecting success:
git log -1 --remerge-diff -p dirfile >output &&
clean_output <output >actual &&
test_cmp expected actual
--- expected 2014-11-10 02:43:35.000000000 +0000
+++ actual 2014-11-10 02:43:35.000000000 +0000
@@ -1,12 +1,12 @@
commit dirfile
-Merge:
+Merge: 8ac24b8 36416b6
Author: A U Thor <author@xxxxxxxxxxx>
-Date:
+Date: Thu Apr 7 15:24:13 2005 -0700
M5
diff --git a/sub/file b/sub/file
-index
+index 0d2ecd7..2ab19ae 100644
--- a/sub/file
+++ b/sub/file
@@ -1 +1 @@
@@ -14,7 +14,7 @@
+resolved
diff --git a/sub~tags/file b/sub~tags/file
deleted file mode 100644
-index
+index f73f309..0000000
--- a/sub~tags/file
+++ /dev/null
@@ -1 +0,0 @@
not ok 6 - file/directory conflict resulting in directory
#
# git log -1 --remerge-diff -p dirfile >output &&
# clean_output <output >actual &&
# test_cmp expected actual
#
checking known breakage:
git log -1 --remerge-diff -p filedir >output &&
clean_output <output >actual &&
test_cmp expected actual
--- expected 2014-11-10 02:43:35.000000000 +0000
+++ actual 2014-11-10 02:43:35.000000000 +0000
@@ -1,21 +1,28 @@
commit filedir
-Merge:
+Merge: 36416b6 8ac24b8
Author: A U Thor <author@xxxxxxxxxxx>
-Date:
+Date: Thu Apr 7 15:25:13 2005 -0700
M6
diff --git a/sub b/sub
-index
---- a/sub
+new file mode 100644
+index 0000000..2ab19ae
+--- /dev/null
+++ b/sub
-@@ -1 +1 @@
--file
+@@ -0,0 +1 @@
+resolved
diff --git a/sub/file b/sub/file
deleted file mode 100644
-index
+index 0d2ecd7..0000000
--- a/sub/file
+++ /dev/null
@@ -1 +0,0 @@
-dir
+diff --git a/sub~tags/file b/sub~tags/file
+deleted file mode 100644
+index f73f309..0000000
+--- a/sub~tags/file
++++ /dev/null
+@@ -1 +0,0 @@
+-file
not ok 7 - file/directory conflict resulting in file # TODO known breakage
# still have 1 known breakage(s)
# failed 4 among remaining 6 test(s)
1..7
On Sun, Nov 9, 2014 at 1:42 PM, Torsten Bögershausen <tboegi@xxxxxx> wrote:
> On 2014-11-09 22.36, Michael Blume wrote:
>> Actually I have a build break in pu on my mac right now. Seems to
>> build fine in ubuntu, but:
>>
>> progress.c:66:15: error: use of undeclared identifier 'CLOCK_MONOTONIC'
>> timer_create(CLOCK_MONOTONIC, &sev, &progress_timer);
> That is not an unkown issue.
> You need to revert one commit (this is my copy of pu from today)
>
> Revert "use timer_settime() for new platforms"
>
> This reverts commit 0950f08806208b4e3d0aff5f4f7d497637ba4cab.
>
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html