-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

## patches

* punkman_conflict_test1.vpatch
* punkman_conflict_test2.vpatch

Two conflicting patches that you might find useful when testing 
your V implementations.

* punkman_debug_sanity_part1.vpatch

The previously posted debug_sanity_part1 patch, now in vdiff format.


## vit

This is my version of V.

Install with pip or otherwise.

`pip install vit-97.tar.gz`

pip will create two scripts named `vit` and `vdiff` and copy them to the 
nearest /bin (likely /usr/bin, or a virtualenv's /bin if you use one, or 
elsewhere depending on pip options).

`vit help` and `vit help <command>` to see details about available commands.

_Feetchures_:

* interactive conflict handling while pressing a patchset
* cache saved to disk, can export cache as json
* auto-rebuild when patch/sig/wot files change
* using (hash,path) instead of (hash) to track patched files
   (since we already have multiple files with duplicate contents)
* bundles "gnupg" instead of "python-gnupg"

Enjoy!


### Examples

$ vit press --wild patches/punkman_conflict_test1.vpatch ./test
Choose a branch:: 
  [0]:  punkman_conflict_test1.vpatch
  [1]:  asciilifeform_and_now_we_have_block_dumper_corrected.vpatch
Enter number: 1
Choose a branch:: 
  [0]:  punkman_conflict_test2.vpatch
  [1]:  asciilifeform_add_verifyall_option.vpatch
Enter number: 0
Removed patches:
  asciilifeform_add_verifyall_option.vpatch
  punkman_debug_sanity_part1.vpatch
  punkman_conflict_test1.vpatch
Pressing using head: asciilifeform_maxint_locks_corrected.vpatch to path: 
'./test'
Using: genesis.vpatch   (asciilifeform,mircea_popescu,mod6,trinque)
patching file bitcoin/.gitignore
[...]

#############

$ vit conflicts
Origin: asciilifeform-kills-integer-retardation.vpatch   (asciilifeform)
Conflict on: bitcoin/src/bitcoinrpc.cpp
  asciilifeform_and_now_we_have_block_dumper_corrected.vpatch
  punkman_conflict_test1.vpatch
 
Origin: asciilifeform_lets_lose_testnet.vpatch   (asciilifeform)
Conflict on: bitcoin/src/init.cpp
  asciilifeform_add_verifyall_option.vpatch
  punkman_conflict_test2.vpatch

#############

$ vit info patches/punkman_debug_sanity_part1.vpatch 

Patch: punkman_debug_sanity_part1.vpatch (punkman)
Hash: 
ba6b850006cf4187d69ad20601034ad064e6899c4de5786c78d253467b6fbbb3e2f295b98e2b69
24c1750d99ef6ca4ec63a728ca356b51501ea75820cfec0ebd

=== Modifications ===

  bitcoin/src/bitcoinrpc.cpp: +3 additions, -36 deletions
  bitcoin/src/db.cpp: +0 additions, -8 deletions
  bitcoin/src/headers.h: +2 additions, -1 deletions
  bitcoin/src/init.cpp: +13 additions, -18 deletions
  bitcoin/src/main.cpp: +1 additions, -10 deletions
  bitcoin/src/main.h: +0 additions, -4 deletions
  bitcoin/src/makefile.unix: +0 additions, -1 deletions
  bitcoin/src/net.cpp: +0 additions, -1 deletions
  bitcoin/src/noui.h: +0 additions, -74 deletions
  bitcoin/src/util.cpp: +7 additions, -28 deletions
  bitcoin/src/util.h: +1 additions, -8 deletions
  bitcoin/src/wallet.cpp: +3 additions, -6 deletions
 
 11 modified file(s), 0 added file(s), 1 removed file(s)
 Total: 30 addition(s), 195 deletion(s)

=== Descendants ===

None found.

=== Antecedents ===

  genesis.vpatch (asciilifeform,mircea_popescu,mod6,trinque)
    bitcoin/src/noui.h
  bitcoin-asciilifeform.1.vpatch (asciilifeform)
    bitcoin/src/wallet.cpp
  bitcoin-asciilifeform.4-goodbye-win32.vpatch (asciilifeform)
    bitcoin/src/headers.h
  asciilifeform_ver_now_5_4_and_irc_is_gone_and_now_must_give_ip.vpatch 
(asciilifeform)
    bitcoin/src/makefile.unix
    bitcoin/src/net.cpp
  asciilifeform_tx-orphanage_amputation.vpatch (asciilifeform)
    bitcoin/src/main.h
  asciilifeform_lets_lose_testnet.vpatch (asciilifeform)
    bitcoin/src/bitcoinrpc.cpp
  asciilifeform_add_verifyall_option.vpatch (asciilifeform)
    bitcoin/src/init.cpp
    bitcoin/src/main.cpp
    bitcoin/src/util.cpp
    bitcoin/src/util.h
  asciilifeform_maxint_locks_corrected.vpatch (asciilifeform)
    bitcoin/src/db.cpp

#############

$ vit origin a/bitcoin/src/bitcoinrpc.cpp 
Origin: asciilifeform_lets_lose_testnet.vpatch (asciilifeform)
Filename: bitcoin/src/bitcoinrpc.cpp
Hash: 
ede2e19dd0ce3d03f54689cbeda30b4b36152f7e532b3d34f0f8c55bb292f7d25c149b88162d96
a8208997237a32566d0e555aa7105bfed8175983d80ad892e6
Offspring:
  punkman_debug_sanity_part1.vpatch
 
#############

$ vit ante patches/asciilifeform_tx-orphanage_amputation.vpatch 
  bitcoin-asciilifeform.4-goodbye-win32.vpatch   (asciilifeform)
    bitcoin/src/main.h
  asciilifeform_orphanage_thermonuke.vpatch   (asciilifeform)
    bitcoin/src/main.cpp

#############

$ vit init
Created ./.vit
Created ./wot
Created ./sigs
Created ./patches

#EOF
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAEBCgAGBQJWBbZOAAoJEDNYi+CLIysT2JwQAJXpRX5s/W6fzUHBxJTsFpdl
zU/WIWC9mqaK+tMfVQE7yTImdQPREVWiUe54G6s7lFY8+WZk0sMXNxlotrNoemGn
o3ZCybx1NYKtI5mHLPrnc4p+grAsX9j0VXXcGVqdyaipT8i0wHgG9wVkzXk/qi6C
lkJG3ymefvGz4bvhuLV6sKY7PC8bDMG134vElls0TppWPb1rCbBj15tdLwd0ZrQr
MwQmTh5zVFsEblw1u57R+UxncVHWIRRoQudcR8BrLxr+Zq1nFpgqYcjT088bn6zD
aTYafnjMGgmVJFnBbxcj3pg8n1Wvk/YwULy6VqmaPrv0rDMJZ8HS62I1lUK3DqPC
cAx3KL1YUllVrEG3KSoWM+LoZ12HdhcombMoIf2XtH0+/AJsn3LufKx2YO29uIvD
s1n9JrlU9AvVz+P63/DONvunvmQGJlC1RNOPOmLGajXeDHerb2g+xYe+0mafIvGU
F8b3uJtpmz/bz4m0C9qh+7Tjb6yWrb9g+dy5OAou+jaIOQK1ycUZ5kIFD4y0DLVz
LWddMLcm1AVFkr6TNChXMb97y0M0EJ2FxnYJv7fudTanFtPUxsoPrQzK6bFWUQr5
jGL6OkjffxBAz+leADP0RIACCIxorTd/WVTPc3yriMR0s+7vFj8jYk/wHOQc8BRk
OVFqiXJH0GadLsNQE+9c
=QJTH
-----END PGP SIGNATURE-----