Re: participation & contribution [was: Latest changes with lisp/uni-*.el and leim/quail]

[Wolfgang Jenkner]

On Tue, Dec 03 2013, Thien-Thi Nguyen wrote:

> () Rüdiger Sonderfeld <address@hidden>
> () Mon, 02 Dec 2013 14:29:53 +0100
>    Is anybody here using git-bzr to push to the Emacs master?
>
> Soon that would be me (and you, right?), and hopefully OP...
>
>    How well does this work?
>
> Why don't you try it and post your observations?  That's what i will do.

Like other people I have done some experiments with local repositories
and there is a thing that bothers me: While, by default, `git push' to
some other git repo succeeds only if this would not change the history
of what is already in that repo, there is apparently no such safeguard
against rewriting history in an upstream bzr repo (and pushing to
a bound branch instead does not quite work).

The stuff below corresponds to "NOTE ABOUT FAST-FORWARDS" in
git-push(1).

[1 /tmp]$ bzr init trunk
Created a standalone tree (format: 2a)
[2 /tmp]$ (cd trunk && touch foo && bzr add $_ && bzr commit -m X && bzr log 
--line)
adding foo
Committing to: /tmp/trunk/
added foo
Committed revision 1.
1: Wolfgang Jenkner 2013-12-02 X
[3 /tmp]$ git clone bzr::trunk local
Cloning into 'local'...
Checking connectivity... done
[4 /tmp]$ (cd trunk && echo "trunk change" >foo && bzr commit -m A && bzr log 
--line) 
Committing to: /tmp/trunk/
modified foo
Committed revision 2.
2: Wolfgang Jenkner 2013-12-02 A
1: Wolfgang Jenkner 2013-12-02 X
[5 /tmp]$ (cd local && echo "local change" >foo && git commit -a -m B && git 
log --oneline && git push) 
[master 8b5e5ad] B
 1 file changed, 1 insertion(+)
8b5e5ad B
ad0e090 X
Text conflict in foo
1 conflicts encountered.
To bzr::/tmp/trunk
   ad0e090..8b5e5ad  master -> master
[6 /tmp]$ (cd trunk && bzr log --line)
2: Wolfgang Jenkner 2013-12-02 B
1: Wolfgang Jenkner 2013-12-02 X
[7 /tmp]$ ls -l trunk
total 12
-rw-r--r--  1 wolfgang  wheel  68 Dec  2 16:52 foo
-rw-r--r--  1 wolfgang  wheel   0 Dec  2 16:52 foo.BASE
-rw-r--r--  1 wolfgang  wheel  13 Dec  2 16:52 foo.OTHER
-rw-r--r--  1 wolfgang  wheel  13 Dec  2 16:52 foo.THIS
[8 /tmp]$ cat trunk/foo
<<<<<<< TREE
trunk change
=======
local change
>>>>>>> MERGE-SOURCE
[9 /tmp]$ cat local/foo
local change
[10 /tmp]$ (cd local && git pull)
Already up-to-date.
[11 /tmp]$ git clone bzr::trunk new-local
Cloning into 'new-local'...
Checking connectivity... done
[12 /tmp]$ cat new-local/foo
local change
[13 /tmp]$ (cd trunk && bzr status)
modified:
  foo
unknown:
  foo.BASE
  foo.OTHER
  foo.THIS
conflicts:
  Text conflict in foo
[14 /tmp]$