a7b5068eea
Merge pull request #331 from pmiossec/crash_clone_whole_repository
...
Correct crash when clone the whole repository
2013-03-25 07:11:55 -07:00
d7347c8d93
Correct crash when clone the whole repository
...
Forget to exit after displaying the warning.
Should fix #330
2013-03-25 14:23:25 +01:00
11995425c1
v0.17.0
2013-03-21 21:50:42 -04:00
98329b58fb
Merge pull request #324 from git-tfs/fix-rcheckin-ignores-no-build-default-comment
...
Fix: Rcheckin ignores --no-build-default-comment option
2013-03-21 14:39:18 -07:00
8b921e4cf3
Removed duplicated line after Matt's review.
2013-03-21 14:53:28 +02:00
e74170291a
Fix: Rcheckin ignores --no-build-default-comment option (during rcheckin of merge commit prevents including all comments from merged commits below original merge-commit comment in git)
2013-03-21 14:53:28 +02:00
e8d3e6fa63
Merge pull request #323 from git-tfs/fix-for-incorrect-folder-deletion-order
...
Resolve problems with folder deletion.
Closes #313 , #320 , #326
2013-03-20 05:16:50 -07:00
a2060cf5a4
Merge remote-tracking branch 'origin/master' into delorder
...
Conflicts:
GitTfs/Core/GitRepository.cs
2013-03-18 17:48:54 -04:00
718fe632ed
Remove debugging code.
2013-03-18 17:43:11 -04:00
10aa79170d
All green.
2013-03-18 17:42:18 -04:00
4b31aa1417
This is what happens when I write C# on my mac.
2013-03-18 17:08:52 -04:00
6df2b209ed
whitespace
2013-03-18 17:07:41 -04:00
693f1174eb
Roll up deletes to just the top level.
2013-03-18 10:38:49 -04:00
c0983fa8d4
Renaming a file disqualifies its parent from being tidied.
2013-03-18 10:38:02 -04:00
4c90c734b4
Merge pull request #325 from git-tfs/fix-git-tfs-authenticates-against-all-tfs-instances
...
git-tfs tries to authenticate against all TFS instances in the branch no matter how old they are
2013-03-11 07:13:38 -07:00
416543cd7a
Fix: git-tfs tries to authenticate against all TFS instances in the branch no matter how old they were in use and if they needed at all.
...
Our TFS instance recently changed URL and without this change it is required to filter-branch entire repository and change every git-tfs-id line in comments just to make git-tfs stop going to old URL to check. With it one should just keep config section for old branch and change the very last commit's comment (for each TFS branch). Also theoretically should save some time if several TFS instances are used as only specified with -i option is authenticated against.
2013-03-11 15:47:16 +02:00
1045a29097
Merge pull request #317 from pmiossec/improve_rcheckin_quick
...
Improve rcheckin quick
2013-03-09 05:36:14 -08:00
a34bf716de
Add an option '--autorebase' to the 'rcheckin --quick' command to continue with rebasing when new changesets fetched
2013-03-09 11:23:24 +01:00
da4fee0d46
rebase remaining commits on last commit done before exiting
...
... due to external commit detected or error during checkin
2013-03-09 11:23:23 +01:00
6e78b56d4d
rcheckin --quick : reset current branch to tfs remote to be synchronized with tfs
2013-03-09 11:23:21 +01:00
cb1040631d
Merge pull request #318 from dschilling/issue/306
...
Fix for init branch issue #306 , 2010 client running against 2008 server
2013-03-08 19:14:47 -08:00
f8d39ec3a8
Merge pull request #321 from pmiossec/editorconfig
...
Add a file to set space settings of VisualStudio automatically
2013-03-08 18:51:39 -08:00
81a1261b9b
Merge pull request #322 from pmiossec/replace_any
...
Replace Count() by Any() when possible
2013-03-08 17:30:26 -08:00
39a68b0b23
Replace Count() by Any() when possible
2013-03-08 22:04:20 +01:00
b2e527d234
Add a file to set space settings of VisualStudio automatically
...
Using the EditorConfig Extension http://visualstudiogallery.msdn.microsoft.com/c8bccfe2-650c-4b42-bc5c-845e21f96328 ,
VisualStudio could open the git-tfs solution with the good space configuration. Easier for new contributions! ;)
See http://editorconfig.org for more details
2013-03-08 21:52:29 +01:00
fd476db20a
Fixed incorrect order of folder deletion in some cases with test
2013-03-07 20:56:47 +02:00
642358a8cf
Merge branch 'master' into issue/306
...
Conflicts:
GitTfs.VsCommon/TfsHelper.PostVs2010.Common.cs
2013-03-05 16:10:40 -05:00
172ea7fa53
Merge pull request #308 from dougwebb/master
...
Only use the last git-tfs-id line from a commit message (e.g. a merge commit message).
2013-02-22 07:48:36 -08:00
fe2a741e68
Cleaning up logic around currentCommit variable
2013-02-22 09:31:55 -05:00
7fdce4afa9
Revert "Visual Studio 2010 sln updates"
...
This reverts commit c4a3511f49
2013-02-21 17:37:51 -05:00
f1402509d2
Handle parsing merge commit messages with multiple TFS changeset ids
...
The original code would null out currentCommit after parsing the FIRST changeset id in the
log message, and associate the null commit hash with any additional changeset ids in the message
for the same commit. This eventually leads to a null reference error when executing git commands
that require the hash.
The new code ignores all of the changeset ids in the commit message except for the last one, which
is the only one that matters.
2013-02-21 16:44:57 -05:00
c4a3511f49
Visual Studio 2010 sln updates
2013-02-21 16:37:57 -05:00
0732786611
Moved init-branch VS 2008 specific behavior down to common base class. In the event of FeatureNotSupported exception, fall back to 2008 behavior.
2013-02-18 10:06:07 -05:00
87d9c4aaa3
Even better, link to the project.
2013-02-07 13:40:31 -05:00
8cc61ee5d2
Merge pull request #305 from steenhulthin/urlfix
...
Link to codebetter build server now has the correct url.
2013-02-07 02:40:50 -08:00
f100014f9e
Link to codebetter build server now has the correct url.
2013-02-07 10:53:25 +01:00
b0daa8ac4a
Merge pull request #281 from pmiossec/extend_branch_command
...
Extend branch command
2013-02-05 04:42:34 -08:00
61f7344122
Merge pull request #302 from pmiossec/fix_init_branch
...
Manage Add ChangeType to correct fail when `init-branch` call
2013-02-04 22:06:07 -08:00
c16df2452f
better way?
2013-02-04 00:27:08 +01:00
b03389e9f2
Manage Add ChangeType to correct fail when init-branch call
2013-02-04 00:05:26 +01:00
2ca75950cb
better branch command description
2013-02-03 22:37:36 +01:00
e4c4776fb7
Control to detect bad command use
2013-02-03 22:32:56 +01:00
bc1b49c8a8
Add init-branch features to branch command
2013-02-03 22:29:22 +01:00
3c4f45f3c1
Creation branch is no more an option but the main action (like git branch ommand)
...
+ rewrite Run() methods
2013-02-03 22:28:49 +01:00
f5f21f2634
branch command description
2013-02-03 22:18:33 +01:00
b5ba9a07ae
Add option --all to display all the root TFS branches
2013-02-03 22:18:33 +01:00
00a6e34d8c
Add create Tfs branch option to branchcommand
...
+ other small refactoring
2013-02-03 22:17:58 +01:00
a334a57952
Add move and delete branch option to branchcommand
...
and add a DeleteTfsRemote() and MoveRemote() in GitRepository
2013-02-03 18:53:16 +01:00
f2c7832ac2
Don't return unvalid remotes
...
The one without Tfs URL or path...
It could happen when renaming a tfs remote with parameters no more supported
2013-02-03 18:53:15 +01:00
242d171650
Verify if querying branch informations are supported
2013-02-03 18:53:15 +01:00
Sean M. Collins