From 590c03cec6464eb2c9286fb6787c154f057918c2 Mon Sep 17 00:00:00 2001 From: Guille Polito Date: Mon, 6 Aug 2018 11:26:13 +0200 Subject: [PATCH] Fix for #952 - test adoption of unknown commit - add implementation of adopt to unknown commit --- .../instance/setUp.st | 2 +- Iceberg.package/IceUnknownCommit.class/instance/adopt.st | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 Iceberg.package/IceUnknownCommit.class/instance/adopt.st diff --git a/Iceberg-Tests.package/IceWithRemoteAndUnknownCommitFixture.class/instance/setUp.st b/Iceberg-Tests.package/IceWithRemoteAndUnknownCommitFixture.class/instance/setUp.st index 15aff16e9b..6f2efea09a 100644 --- a/Iceberg-Tests.package/IceWithRemoteAndUnknownCommitFixture.class/instance/setUp.st +++ b/Iceberg-Tests.package/IceWithRemoteAndUnknownCommitFixture.class/instance/setUp.st @@ -3,4 +3,4 @@ setUp super setUp. "Set a commit that is known in the remote repository but not in the local one" - self repository workingCopy referenceCommit: (self repository lookupCommit: remoteRepository headCommit id) \ No newline at end of file + (self repository lookupCommit: remoteRepository headCommit id) adopt \ No newline at end of file diff --git a/Iceberg.package/IceUnknownCommit.class/instance/adopt.st b/Iceberg.package/IceUnknownCommit.class/instance/adopt.st new file mode 100644 index 0000000000..c1adc0aaf4 --- /dev/null +++ b/Iceberg.package/IceUnknownCommit.class/instance/adopt.st @@ -0,0 +1,7 @@ +API-working copy +adopt + + "Low level. + For the working copy to adopt myself as reference commit" + + self repository workingCopy adoptCommit: self \ No newline at end of file