I rebased 6.x-3.x onto master branch and pushed as 6.x-2.x. Only conflict was CHANGELOG.txt and removal of pift.js. After completion I diffed 6.x-2.x against master and provided the following.

CommentFileSizeAuthor
#2 pift.finish_rebase_port.patch4.67 KBrfay
#1 1094212-rebase.patch1.8 KBboombatower

Comments

boombatower’s picture

boombatower commented
Assigned: Unassigned » boombatower
Status: Active » Fixed
StatusFileSize
new 1094212-rebase.patch1.8 KB

So really the only changes are the default value for variable and setting form item.

rfay’s picture

rfay
he,him
Primary language English
Location Palisade, CO, USA
commented
StatusFileSize
new pift.finish_rebase_port.patch4.67 KB

Here is the patch corresponding to the additional two commits I just merged onto master. I believe all the key features are working now.

Note that I did neuter the processing of dependencies. I think that should be the next big push.

Commits http://drupalcode.org/project/project_issue_file_test.git/commit/4b834d4 and http://drupalcode.org/project/project_issue_file_test.git/commit/70f6c1a

These are now merged back onto 6.x-2.x.

rfay’s picture

rfay
he,him
Primary language English
Location Palisade, CO, USA
commented
Title: Rebase 6.x-3.x onto master as 6.x-2.x » Rebase 6.x-3.x onto 6.x-2.2

I seem to have gotten confused between PIFR and PIFT approaches. Anyway, all the work is on 6.x-2.2

boombatower’s picture

boombatower commented
Title: Rebase 6.x-3.x onto 6.x-2.2 » Rebase 6.x-3.x (2.2 + git) onto master as 6.x-2.x

The 6.x-3.x branched off master at 2.2 so I rebased the changes onto master and pushed as 6.x-2.x.

rfay’s picture

rfay
he,him
Primary language English
Location Palisade, CO, USA
commented

Pushed a documentation commit to document the batch format and response format:
http://drupalcode.org/project/project_issue_file_test.git/commit/4f34cc1

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.