Commits

Show all
Author Commit Message Labels Comments Date
Nathan Durnan
Merge is much happier with Tool Resolve on timestamp file now! Fixes Issue #21 at BitBucket.
Branches
BBI#21
Nathan Durnan
Don't save record file timestamp! This just causes confusion with merging. See Issues #21 and #26 at BitBucket. Many thanks to lboehler for recommending solution!
Branches
BBI#21
Nathan Durnan
Use Sorted List for timestamp record file. See Issue #21 and #26 at BitBucket. Many thanks to lboehler for recommending solution!
Branches
BBI#21
Nathan Durnan
Remove attempts to wrap Merge event. Not needed - better solution determined. See Issue #21 at BitBucket.
Branches
BBI#21
Nathan Durnan
Having trouble properly wrapping the Merge command See Issue #21 at BitBucket.
Branches
BBI#21
Nathan Durnan
Create Wrap_Merge definition. See Issue #21 at BitBucket.
Branches
BBI#21
Nathan Durnan
Reopen issue #21 at BitBucket - Attempt to wrap merge event. Merge with development
Branches
BBI#21
Nathan Durnan
Merge with default
Branches
development
Nathan Durnan
Added tag Version 0.1.1 for changeset 057a8fcebbd1
Nathan Durnan
Merge with Release 0.1.1
Tags
Version 0.1.1
Nathan Durnan
Version 0.1.1 ready for release.
Branches
Release 0.1.1
Nathan Durnan
Prepare a new release for fixes so far. Addresses issue with Subrepo commit in TortoiseHg 2.2.x
Branches
Release 0.1.1
Nathan Durnan
Merge with BBI#25 - Subrepo Commit Issue
Branches
development
Nathan Durnan
Close Issue #25 at Bitbucket.
Branches
BBI#25
Nathan Durnan
Use 'scmutil.matchall' in place of 'match.always' to avoid error. Fixes Issue #25 at BitBucket
Branches
BBI#25
Nathan Durnan
BitBucket Issue #25: Subrepo Commit Fails Getting following error: 'NoneType' object has no attribute 'always' when attempting to commit a top-level repo with changes in subrepo.
Branches
BBI#25
Nathan Durnan
Merge with BBI#21
Branches
development
Nathan Durnan
Further Merge changes on hold again temporarily. See Issue #21 at BitBucket
Branches
BBI#21
Nathan Durnan
Debug/Status message tweaks.
Branches
BBI#21
Nathan Durnan
Renamed function arguments to indicate IN_ OUT_ or INOUT_ useage. See issue #21 at BitBucket. Attempting to standarize naming conventions.
Branches
BBI#21
Nathan Durnan
Replace global List_CommitMatch with arguments in function calls. See issue #21 at BitBucket. Attempt to make the functions calls more modular instead of relying on globals.
Branches
BBI#21
Nathan Durnan
Debug/Warning message tweak.
Branches
BBI#21
Nathan Durnan
Replace global TimeStamp_dict usage with argument calls in functions. See issue #21 at BitBucket. Attempt to make the functions calls more modular instead of relying on globals.
Branches
BBI#21
Nathan Durnan
Merge with development
Branches
BBI#21
Nathan Durnan
Merge with BBI#19
Branches
development
Nathan Durnan
Can't seem to reproduce issue? See Issue #19 @BitBucket
Branches
BBI#19
Nathan Durnan
Clarification parenthesis on test statements. See Issue #19 @BitBucket.
Branches
BBI#19
Nathan Durnan
Changed from file() method to open() method and added more detailed exception reporting. See Issue #19 @BitBucket.
Branches
BBI#19
Nathan Durnan
BitBucket Issue #19: Initial Repository Creation fails to create/add .hgtimestamp file
Branches
BBI#19
Nathan Durnan
Begin adding Pre-Merge hook. see Issue #21 @BitBucket.
Branches
BBI#21
  1. Prev
  2. Next