headers
Daniel Dehennin | 2 Sep 20:06

http://ftp-master.debian.org/new/dvc_0r20080829-1.html.

Committed revision 209 to http://www.asgardr.info/~nebu/archives/dvc.dev/

Update timestamp: package in debian new queue http://ftp-master.debian.org/new/dvc_0r20080829-1.html.

--

-- 
Daniel Dehennin
Récupérer ma clef GPG:
gpg --keyserver pgp.mit.edu --recv-keys 0x6A2540D1

_______________________________________________
Dvc-dev mailing list
Dvc-dev <at> gna.org
https://mail.gna.org/listinfo/dvc-dev
Permalink | Reply | 0 comments |
headers
Stefan Reichör | 2 Sep 22:05
Picon

[commit] rev 486: Patch from Thierry Volpiatto: Add default prompt to xhg-qnew based on last revision

Committed revision 486 to http://bzr.xsteve.at/dvc/

Patch from Thierry Volpiatto: Add default prompt to xhg-qnew based on last revision
Permalink | Reply | 0 comments |
headers
Stefan Reichör | 2 Sep 22:05
Picon

[commit] rev 487: Merged from Daniel Dehennin: Final debian packaging changes before dvc enters the debian package space

Committed revision 487 to http://bzr.xsteve.at/dvc/

Merged from Daniel Dehennin: Final debian packaging changes before dvc enters the debian package space
    ------------------------------------------------------------
    revno: 94.1.115
    committer: Daniel Dehennin <daniel.dehennin <at> baby-gnu.org>
    branch nick: dvc.dev
    timestamp: Tue 2008-09-02 20:05:50 +0200
    message:
      Update timestamp: package in debian new queue http://ftp-master.debian.org/new/dvc_0r20080829-1.html.
    ------------------------------------------------------------
    revno: 94.1.114
    committer: Daniel Dehennin <daniel.dehennin <at> baby-gnu.org>
    branch nick: dvc.dev
    timestamp: Fri 2008-08-29 19:26:40 +0200
    message:
      Keep only one changelog entry until the package reach debian.
    ------------------------------------------------------------
    revno: 94.1.113
    committer: Daniel Dehennin <daniel.dehennin <at> baby-gnu.org>
    branch nick: dvc.dev
    timestamp: Fri 2008-08-29 19:11:14 +0200
    message:
      New debian version.
    ------------------------------------------------------------
    revno: 94.1.112
    committer: Daniel Dehennin <daniel.dehennin <at> baby-gnu.org>
    branch nick: dvc.dev
    timestamp: Fri 2008-08-29 19:10:10 +0200
    message:
(Continue reading)

Permalink | Reply | 0 comments |
headers
Vincent Ladeuil | 4 Sep 10:23
Picon
Favicon

bzr-gnus-apply-patch not implemented ?

Hi all,

While searching for a way to create a new branch from a bzr
bundle, I came across bzr-gnus-apply-patch and
bzr-apply-patch-mapping which sounded promising.

Unfortunately the former doesn't seem to be implemented and the
later is not referenced anywhere.

Are they plans to implement it ?

How do you guys proceed ?

Thanks in advance,

       Vincent
Permalink | Reply | 13 comments |
headers
Stefan Reichör | 4 Sep 19:14
Picon

Re: bzr-gnus-apply-patch not implemented ?

Hi Vincent!

> Hi all,
>
> While searching for a way to create a new branch from a bzr
> bundle, I came across bzr-gnus-apply-patch and
> bzr-apply-patch-mapping which sounded promising.
>
> Unfortunately the former doesn't seem to be implemented and the
> later is not referenced anywhere.
>
> Are they plans to implement it ?

bzr-gnus.el holds the available functionaltiy to handle bzr patches.

bzr-gnus-merge-bundle allows to merge an attached bzr bundle to an
existing branch.

What do you want to achieve?

Can you tell me a sequence of bzr shell commands that should be
implemented?

I am willing to implement your desired functionality if you provide the
necessary details.

Stefan.
Permalink | Reply | 12 comments |
headers
Vincent Ladeuil | 5 Sep 16:31
Picon
Favicon

Re: bzr-gnus-apply-patch not implemented ?

>>>>> "stefan" == Stefan Reichör <stefan <at> xsteve.at> writes:

    stefan> Hi Vincent!
    >> Hi all,
    >> 
    >> While searching for a way to create a new branch from a bzr
    >> bundle, I came across bzr-gnus-apply-patch and
    >> bzr-apply-patch-mapping which sounded promising.
    >> 
    >> Unfortunately the former doesn't seem to be implemented and the
    >> later is not referenced anywhere.
    >> 
    >> Are they plans to implement it ?

    stefan> bzr-gnus.el holds the available functionaltiy to handle bzr patches.

    stefan> bzr-gnus-merge-bundle allows to merge an attached bzr
    stefan> bundle to an existing branch.

Ok.

    stefan> What do you want to achieve?

Create a new branch based on the same revision that the bundle,
then apply the bundle.

Because, 99% of the time, when I look at a bundle I don't have a
monkey branch waiting for the bundle.

Moreover, as far as possible I want to be in the same state than
(Continue reading)

Permalink | Reply | 11 comments |
headers
Stephen Leake | 7 Sep 00:04
Favicon

rev 480: Add first draft of xmtn-conflicts.el; not functional.

Committed revision 480 to http://stephe-leake.org/dvc

Add first draft of xmtn-conflicts.el; not functional.

  * lisp/xmtn-basic-io.el (xmtn-basic-io--read-field): Add doc string.
    Allow a symbol value.
    (xmtn-basic-io--peek): New.

  * lisp/xmtn-conflicts.el: New; parse, edit output of 'automate
    conflicts', for 'merge --resolve-conflicts-file'.

--

-- 
-- Stephe
Permalink | Reply | 0 comments |
headers
Stephen Leake | 7 Sep 00:06
Favicon

rev 484: minor cleanups.

Committed revision 484 to http://stephe-leake.org/dvc

minor cleanups.

--

-- 
-- Stephe
Permalink | Reply | 0 comments |
headers
Stephen Leake | 7 Sep 00:05
Favicon

rev 483: mtn conflict resolution: Add better top-level interface, improve operation. Basically functional.

Committed revision 483 to http://stephe-leake.org/dvc

mtn conflict resolution: Add better top-level interface, improve operation. Basically functional.

  * lisp/xmtn-automate.el (xmtn-automate--append-encoded-strings): Allow
    nil in list of strings.

  * lisp/xmtn-basic-io.el (xmtn-basic-io-parse-line,
    xmtn-basic-io-check-line, xmtn-basic-io-check-empty): move here from
    xmtn-conflicts.el

  * lisp/xmtn-conflicts.el (xmtn-conflicts-parse-content-conflict): fix small bug.
    (xmtn-conflicts-save): Replace region, don't just add to it.
    (xmtn-conflicts-resolve-conflict-post-ediff): Clean up stuff.
    (xmtn-conflicts-resolve-content-ediff): new.
    (xmtn-conflicts-resolve-content-file): new.
    (xmtn-check-workspace-for-propagate): new
    (xmtn-conflicts-propagate): new
    (xmtn-conflicts-merge): new
    (xmtn-conflicts-clean): new.

--

-- 
-- Stephe
Permalink | Reply | 0 comments |
headers
Stephen Leake | 7 Sep 00:05
Favicon

rev 482: xmtn-conflicts: add resolution.

Committed revision 482 to http://stephe-leake.org/dvc

xmtn-conflicts: add resolution.

  * lisp/dvc-diff.el (dvc-diff-unmark-file): Simplify call to dvc-fileinfo-next.

  * lisp/dvc-utils.el (dvc-make-ewoc-next): new.
    (dvc-make-ewoc-prev): new.

  * lisp/xmtn-conflicts.el (xmtn-conflicts-current-conflict-buffer): new
    (xmtn-conflicts-ediff-quit-info): new.
    (xmtn-conflicts-parse-content-conflict): check for "file" file-type.
    (xmtn-conflicts-after-insert-file): Move more functionality here.
    (xmtn-conflicts-write-header): improve handling of blank lines.
    (xmtn-conflicts-write-content): ditto.
    (xmtn-conflicts-resolvedp): new.
    (xmtn-conflicts-next-unresolved): new
    (xmtn-conflicts-prev-unresolved): new
    (xmtn-conflicts-resolve-conflict-post-ediff): new.
    (xmtn-conflicts-resolve-content): new
    (xmtn-conflicts-resolve-conflict): new.
    (xmtn-conflicts-mode-map): Define some keys.
    (xmtn-conflicts-mode-menu): Define some menu entries.
    (xmtn-conflicts-mode): fix local variable stuff.
    (xmtn-conflicts): Change to require workspace, other revision, canonical conflicts file.
    (xmtn-conflicts-review): Change to require workspace, use canonical workspace file.

--

-- 
-- Stephe
(Continue reading)

Permalink | Reply | 0 comments |

Gmane