[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: patch vs. overwrite in bzr

From: =?utf-8?Q?=C3=93scar_Fuentes?=
Subject: Re: patch vs. overwrite in bzr
Date: Tue, 03 Apr 2012 17:02:45 +0200
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux)

Bastien <address@hidden> writes:

> The problem is: how to create a patch from Org git repo that can be
> easily applied to Emacs bzr repo.

I don't know how the file structure of Org maps to Emacs' but this
should work for obtaining the changes made to `lisp' directory of Org:

`git diff COMMIT1 COMMIT2 lisp > changes-in-org-lisp.patch'

where COMMIT1 is the range of revisions containing the changes you want
to incorporate into Emacs. Then, on the Emacs source tree, cd to
lisp/org and

patch -p 2 < changes-in-org-lisp.patch

Watch for conflicts.

Repeat for `doc' and other directories to be synched.

Review the changes with `bzr diff' and commit.

There should be no conflicts if you previously followed the same
procedure but in the Emacs -> Org direction.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]