partial commits

Erik Bågfors zindar at gmail.com
Fri May 6 07:11:44 BST 2005


>From what I understand a annotated diff will be what will be used for
"bzr send", which means that this is the format that people will get
used to seeing the diff with. It's also very close to what people are
used to if they are used to using diff and patch.

In other words, I think this is a great idea.  I was thinking about
implementing partial commits for bzr and had the same idea. I'm glad
you beat me to it (since I have no time :))

/Erik

On 5/6/05, jan <janmar at iprimus.com.au> wrote:
> 
> I've almost got an interface for cherrypicking changes from the
> working copy, I just need a way to do partial commits. I think the
> best way to specify the changes will be with an annotated diff eg.
> 
> bzr commit "
> ## bzr annotated diff
> ##
> ## revision-id: working-copy
> ## comments:
> ##   Change hello.c and rename foo.c
> ## ....
> ##
> ## modified file
> ## path: src/hello.c
> ## ...
> +++ src/hello.c
> --- src/hello.c
> 0,0 at 1,1
>  int main()
>  {
> +   hello();
>  }
> 
> ## ....
> ##
> ## renamed file
> ## path: src/foo.c
> ## new-path: src/bar.c
> "
> 
> Any objections?
> 
> --
> jan
> 
> --
> bazaar-ng mailing list
> bazaar-ng at lists.canonical.com
> http://lists.canonical.com/mailman/listinfo/bazaar-ng
>




More information about the bazaar mailing list