New submission from Korusef <[EMAIL PROTECTED]>:
In the attached log is the error when I was trying to repair commited
patches by splitting them.
The commands were:
darcs get A B
cd B;
darcs obliterate --patch='....';
darcs pull <one patch>
darcs unrecord <the pulled patch>
#some changes to the file and then saved as few separate patches
darcs pull <again the same patch>
darcs revert #to get rid of the conflicts
darcs rollback
#several edit + darcs revert + darcs record to make the final version
#now I can't pull or push from the repo
----------
files: log.log
messages: 1183
nosy: EricKow, Korusef, droundy, tommy
status: unread
title: pulling to rollbacked branch
____________________________________
Darcs issue tracker <[EMAIL PROTECTED]>
<http://bugs.darcs.net/issue335>
____________________________________
Pulling from "/home/korusef/BIG/darcs_archive/home/++work/++main/main/msl/policy/ublas_branch/main/cpplib/math"...
Tue Nov 7 19:00:25 CET 2006 [EMAIL PROTECTED]
* fix design : add private ctor : ./SparseVector.hpp ./src/SparseVector.ipp
Shall I pull this patch? (1/16) [ynWvpxqadjk], or ? for help:
Tue Nov 7 19:01:02 CET 2006 [EMAIL PROTECTED]
* fix syntax : operator-() conversion : ./src/SparseVector.ipp
Shall I pull this patch? (2/16) [ynWvpxqadjk], or ? for help:
scrad: bug in darcs!
in function reconcile_unwindings
Original patch:
merger 0.0 (
regrem 0.0 (
hunk ./SparseVector.hpp 171
- /**
- * Internal ctor used in numeric operators
- *
- * @ctor
- * @param TC const& data of the vector in convertible type
- * @param TI const& dimension of the vector
- */
- template <class TC, class TI> SparseVector(TC const&, TI const&);
+ private:
+ Impl mData;
hunk ./SparseVector.hpp 171
- /**
- * Internal ctor used in numeric operators
- *
- * @ctor
- * @param TC const& data of the vector in convertible type
- * @param TI const& dimension of the vector
- */
- template <class TC, class TI> SparseVector(TC const&, TI const&);
+ private:
+ Impl mData;
)
merger 0.0 (
merger 0.0 (
hunk ./SparseVector.hpp 171
- /**
- * Internal ctor used in numeric operators
- *
- * @ctor
- * @param TC const& data of the vector in convertible type
- * @param TI const& dimension of the vector
- */
- template <class TC, class TI> SparseVector(TC const&, TI const&);
+ private:
+ Impl mData;
hunk ./SparseVector.hpp 171
- /**
- * Internal ctor used in numeric operators
- *
- * @ctor
- * @param TC const& data of the vector in convertible type
- * @param TI const& dimension of the vector
- */
- template <class TC, class TI> SparseVector(TC const&, TI const&);
+ private:
+ Impl mData;
)
hunk ./SparseVector.hpp 173
+
+ /**
+ * Creates vector from internal data
+ *
+ * Note: For sparce vector it means empty container and size as the param.
+ *
+ * @ctor
+ * @param Impl const& inner data of the vector
+ */
+ //=++=updavit komentare podle ipp
+ explicit SparseVector(Impl const&);
)
)
Please report this to [EMAIL PROTECTED]
If possible include the output of 'darcs --exact-version'.
darcs compiled on Nov 8 2006, at 12:55:26
# configured Wed Nov 8 12:50:20 CET 2006
./configure --prefix=/home/korusef/q_prefix/darcs/ --no-create --no-recursion
Context:
[Look for Text.Regex in package regex-compat. Needed for GHC 6.6
Josef Svenningsson <[EMAIL PROTECTED]>**20061004123158]
[bumb version to 1.0.9rc2
Tommy Pettersson <[EMAIL PROTECTED]>**20061009204226]
[TAG 1.0.9rc1
Tommy Pettersson <[EMAIL PROTECTED]>**20061008175207]
_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
