[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: adapting changesets without starting over
From: |
Ben Abbott |
Subject: |
Re: adapting changesets without starting over |
Date: |
Sat, 27 Aug 2011 11:49:20 -0400 |
On Aug 27, 2011, at 4:58 AM, Carlo de Falco wrote:
> Hi,
>
> I had prepared the following patches before the policy for changelogs was
> modified
>
> https://savannah.gnu.org/patch/?7482
> https://savannah.gnu.org/patch/?7483
> https://savannah.gnu.org/patch/?7484
>
> can someone suggest the correct procedure to adapt them to the new system
> without starting
> over with the changes and keeping each as a single changeset?
>
> c.
Carlo,
I edited the first changeset to remove the diff for the Changelog and moved its
comments in to the commit log. The top 23 lines are below. The resulting
changeset imported without error.
1 # HG changeset patch
2 # User Carlo de Falco <address@hidden>
3 # Date 1298752790 -3600
4 # Node ID 2e7302204709a0fa897a4b06fa18c13ae4b07893
5 # Parent 139f993936af97c22536b71d0b648b015028cb71
6 Allow passing a function handle for the coefficient matrix in cgs
7
8 * sparse/cgs.m: Allow passing a function handle for the
9 coefficient matrix.
10
11 diff -r 139f993936af -r 2e7302204709 scripts/sparse/cgs.m
12 --- a/scripts/sparse/cgs.m Fri Feb 25 20:12:05 2011 -0800
13 +++ b/scripts/sparse/cgs.m Sat Feb 26 21:39:50 2011 +0100
14 @@ -1,4 +1,5 @@
15 ## Copyright (C) 2008-2011 Radek Salac
16 +## Copyright (C) 2011 Carlo de Falco
17 ##
18 ## This file is part of Octave.
19 ##
20 @@ -17,134 +18,159 @@
21 ## <http://www.gnu.org/licenses/>.
22
23 ## -*- texinfo -*-
Is that what you're looking to do?
Ben
- adapting changesets without starting over, Carlo de Falco, 2011/08/27
- Re: adapting changesets without starting over,
Ben Abbott <=
- Re: adapting changesets without starting over, Jordi Gutiérrez Hermoso, 2011/08/27
- Re: adapting changesets without starting over, c., 2011/08/27
- Re: adapting changesets without starting over, Jordi Gutiérrez Hermoso, 2011/08/27
- Re: adapting changesets without starting over, c., 2011/08/27
- Re: adapting changesets without starting over, Jordi Gutiérrez Hermoso, 2011/08/27
- Re: adapting changesets without starting over, c., 2011/08/27
- Re: adapting changesets without starting over, Jordi Gutiérrez Hermoso, 2011/08/27
- Re: adapting changesets without starting over, c., 2011/08/27
- Re: adapting changesets without starting over, Carlo de Falco, 2011/08/28
- Re: adapting changesets without starting over, Jordi Gutiérrez Hermoso, 2011/08/28