Merge lp:~vitaly-v-ch/bzr-vimdiff/cvv into lp:bzr-vimdiff

[vitaly.v.ch]

old and new files located like qdiff

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

vitaly.v.ch wrote:
> vitaly.v.ch has proposed merging lp:~vitaly-v-ch/bzr-vimdiff/cvv into lp:bzr-vimdiff.
>
> Requested reviews:
> Bazaar Developers (bzr)
>
>
> old and new files located like qdiff
>

Personally, I intentionally put the file-to-edit on the left, because
that is the buffer that you start in. Which means that as soon as you
start up, you can edit the file, rather than having to start by
switching to the second window.

I would be okay with a flag for this, but I really do prefer the
file-to-edit on the left.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkwmAIoACgkQJdeBCYSNAAPzWACfelrt6xhtGq+HiE8AB/zsKtsp
EmAAniQ/pjUzL/kcvJgsUxmF9HsOb3Jq
=lk5/
-----END PGP SIGNATURE-----

[vitaly.v.ch (vitaly-v-ch)]

Hm, may I will add config option for in in future.

\\wbr Vitaly Chernookiy

On Sat, Jun 26, 2010 at 4:31 PM, John A Meinel <email address hidden> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> vitaly.v.ch wrote:
>> vitaly.v.ch has proposed merging lp:~vitaly-v-ch/bzr-vimdiff/cvv into lp:bzr-vimdiff.
>>
>> Requested reviews:
>>   Bazaar Developers (bzr)
>>
>>
>> old and new files located like qdiff
>>
>
> Personally, I intentionally put the file-to-edit on the left, because
> that is the buffer that you start in. Which means that as soon as you
> start up, you can edit the file, rather than having to start by
> switching to the second window.
>
> I would be okay with a flag for this, but I really do prefer the
> file-to-edit on the left.
>
> John
> =:->
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.9 (Cygwin)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>
> iEYEARECAAYFAkwmAIoACgkQJdeBCYSNAAPzWACfelrt6xhtGq+HiE8AB/zsKtsp
> EmAAniQ/pjUzL/kcvJgsUxmF9HsOb3Jq
> =lk5/
> -----END PGP SIGNATURE-----
> --
> https://code.launchpad.net/~vitaly-v-ch/bzr-vimdiff/cvv/+merge/28554
> You are the owner of lp:~vitaly-v-ch/bzr-vimdiff/cvv.
>

[Jelmer Vernooij (jelmer)]

Hi Vitaly,

> Hm, may I will add config option for in in future.
I'll setting this back to Work In Progress for the moment. Looking forward to your patch :)

Cheers,

Jelmer

> \\wbr Vitaly Chernookiy
>
> On Sat, Jun 26, 2010 at 4:31 PM, John A Meinel <email address hidden> wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > vitaly.v.ch wrote:
> >> vitaly.v.ch has proposed merging lp:~vitaly-v-ch/bzr-vimdiff/cvv into lp
> :bzr-vimdiff.
> >>
> >> Requested reviews:
> >>   Bazaar Developers (bzr)
> >>
> >>
> >> old and new files located like qdiff
> >>
> >
> > Personally, I intentionally put the file-to-edit on the left, because
> > that is the buffer that you start in. Which means that as soon as you
> > start up, you can edit the file, rather than having to start by
> > switching to the second window.
> >
> > I would be okay with a flag for this, but I really do prefer the
> > file-to-edit on the left.
> >
> > John
> > =:->
> > -----BEGIN PGP SIGNATURE-----
> > Version: GnuPG v1.4.9 (Cygwin)
> > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
> >
> > iEYEARECAAYFAkwmAIoACgkQJdeBCYSNAAPzWACfelrt6xhtGq+HiE8AB/zsKtsp
> > EmAAniQ/pjUzL/kcvJgsUxmF9HsOb3Jq
> > =lk5/
> > -----END PGP SIGNATURE-----
> > --
> > https://code.launchpad.net/~vitaly-v-ch/bzr-vimdiff/cvv/+merge/28554
> > You are the owner of lp:~vitaly-v-ch/bzr-vimdiff/cvv.
> >

[vitaly.v.ch (vitaly-v-ch)]

LinkedIn
------------

I'd like to add you to my professional network on LinkedIn.

- Vitaly

Vitaly Chernooky
Senior Software Engineer at GlobalLogic
Ukraine

Confirm that you know Vitaly Chernooky:
https://www.linkedin.com/e/-bhhzug-h71n7puy-5t/isd/8629426412/bVM9Uitq/?hs=false&tok=0hWC1m9d-HIlo1

--
You are receiving Invitation to Connect emails. Click to unsubscribe:
http://www.linkedin.com/e/-bhhzug-h71n7puy-5t/vavxsL4uPq_65Io3vuodCdRRc4xZcnqPpzkcKO5lTZ/goo/mp%2B28554%40code%2Elaunchpad%2Enet/20061/I2902414468_1/?hs=false&tok=12RHXdGK-HIlo1

(c) 2012 LinkedIn Corporation. 2029 Stierlin Ct, Mountain View, CA 94043, USA.

Unmerged revisions

18. By vitaly.v.ch on 2010-06-26

Старый и новый файл располагаются как в qdiff

=== modified file '__init__.py'
--- __init__.py	2007-07-13 01:34:55 +0000
+++ __init__.py	2010-06-26 10:22:31 +0000
@@ -129,7 +129,7 @@
 
 def run_vimdiff(vimdiff_args, new_file_path, old_file_path):
     import subprocess
-    sub = subprocess.call(vimdiff_args + [new_file_path, old_file_path])
+    sub = subprocess.call(vimdiff_args + [old_file_path, new_file_path])
 
 
 register_command(cmd_gvimdiff)