← Back to branch summary

~ubuntu-branches/ubuntu/trusty/monodevelop/trusty-proposed

« back to all changes in this revision

Viewing changes to external/ngit/NGit.Test/NGit.Api/PathCheckoutCommandTest.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2013-05-12 09:46:03 UTC
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20130512094603-mad323bzcxvmcam0
Tags: upstream-4.0.5+dfsg
Import upstream version 4.0.5+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
external/ngit/NGit.Test/NGit.Api/PathCheckoutCommandTest.cs
255
255
                        NUnit.Framework.Assert.AreEqual("1", Read(test));
256
256
                        NUnit.Framework.Assert.AreEqual("a", Read(test2));
257
257
                }
 
258
 
 
259
                /// <exception cref="System.Exception"></exception>
 
260
                public virtual void TestCheckoutOfConflictingFileShouldThrow()
 
261
                {
 
262
                        // Setup
 
263
                        git.Checkout().SetCreateBranch(true).SetName("conflict").SetStartPoint(initialCommit
 
264
                                ).Call();
 
265
                        WriteTrashFile(FILE1, "Conflicting");
 
266
                        RevCommit conflict = git.Commit().SetAll(true).SetMessage("Conflicting change").Call
 
267
                                ();
 
268
                        git.Checkout().SetName("master").Call();
 
269
                        git.Merge().Include(conflict).Call();
 
270
                        NUnit.Framework.Assert.AreEqual(RepositoryState.MERGING, db.GetRepositoryState());
 
271
                        // Now check out the conflicting path
 
272
                        git.Checkout().AddPath(FILE1).Call();
 
273
                }
258
274
        }
259
275
}